Version 1.5.18

- Added a missing reset of maxNumber in cChannels::Renumber() (reported by Sundararaj Reel). - Revoked the fixed change of the default character set for SI data and introduced an environment variable to control it (thanks to Ales Jurik for reporting broken SI data on the Czech/Slovak channels, which actually do follow the standard). Users who want to set the default character set to something different can do this by setting the environment variable VDR_CHARSET_OVERRIDE to something like ISO-8859-9. - Fixed a signed character used as index in cBase64Encoder::NextLine() (thanks to Tobias Grimm). - Updated the Spanish and Catalanian OSD texts (thanks to Luca Olivetti). - Fixed automatically selecting the preferred subtitle language (based on a patch from Rolf Ahrenberg). - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk). - Updated the Italian OSD texts (thanks to Diego Pierotto). - Updated the Polish OSD texts (thanks to Michael Rakowski). - Fixed formatting the name section in the VDR man pages (thanks to Tobias Grimm). - Updated the Swedish OSD texts (thanks to Magnus Andersson). - Added Russian translations to the 'skincurses' and 'pictures' plugins (thanks to Alexander Gross). - Fixed displaying the free disk space when entering the recordings menu where the last replayed recording was in a subdirectory, and pressing Back (thanks to Rolf Ahrenberg). - Fixed tuning to a live channel after a recording has been stopped using the 'Back' key. - Resetting a timer's 'pending' flag when it has ended.
2025-03-01 10:50:46 +00:00 · 2008-03-16 18:00:00 +01:00
parent 0872cba0a1
commit 7ba8708b5b
23 changed files with 430 additions and 297 deletions
--- a/20
+++ b/20
@@ -1046,6 +1046,10 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
 SVDRP in case VDR is run with --vfat, in order to avoid names that are too long
 for Windows
 for increasing the valid range of the "Subtitle offset" setup option to -100...100
+ for a patch that was used to fix automatically selecting the preferred subtitle
+ language
+ for fixing displaying the free disk space when entering the recordings menu where
+ the last replayed recording was in a subdirectory, and pressing Back

 Ralf Klueber <ralf.klueber@vodafone.com>
 for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1715,6 +1719,7 @@ Luca Olivetti <luca@ventoso.org>
 for suggesting to implement a timeout for remote controls that don't deliver
 "repeat" keypresses very fast
 for reporting a broken entry 'A111.1W' in sources.conf
+ for translating OSD texts to the Spanish and Catalanian language

 Mikko Salo <mikko.salo@ppe.inet.fi>
 for suggesting to make the setup option "DVB/Video display format" available only
@@ -2104,6 +2109,8 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
 for suggesting that the 'plugins' target in the Makefile should return an error exit
 code if one of the plugins failed to compile
 for making the non-breaking space symbol be rendered as a blank
+ for fixing a signed character used as index in cBase64Encoder::NextLine()
+ for fixing formatting the name section in the VDR man pages

 Helge Lenz <h.lenz@gmx.de>
 for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2321,3 +2328,16 @@ Tomas Berglund <tomber@telia.com>

 Johan Schuring <johan.schuring@vetteblei.nl>
 for translating OSD texts to the Dutch language
+
+Sundararaj Reel <sundararaj.reel@googlemail.com>
+ for reporting a missing reset of maxNumber in cChannels::Renumber()
+
+Ales Jurik <ajurik@quick.cz>
+ for reporting broken SI data on Czech/Slovak channels after changing the default
+ character set to ISO-8859-9
+
+Magnus Andersson <svankan@bahnhof.se>
+ for translating OSD texts to the Swedish language
+
+Alexander Gross <Bikalexander@gmail.com>
+ for adding Russian translations to the 'skincurses' and 'pictures' plugins
--- a/29
+++ b/29
@@ -5693,3 +5693,32 @@ Video Disk Recorder Revision History
 - Changed the default character set for SI data from ISO6937 (as required by the DVB
  standard ETSI EN 300 468) to ISO-8859-9, in order to work around the stupidity of
  some providers, who actually use ISO-8859-9, but fail to correctly announce that.
+
+2008-03-16: Version 1.5.18
+
+- Added a missing reset of maxNumber in cChannels::Renumber() (reported by Sundararaj
+  Reel).
+- Revoked the fixed change of the default character set for SI data and introduced
+  an environment variable to control it (thanks to Ales Jurik for reporting broken
+  SI data on the Czech/Slovak channels, which actually do follow the standard).
+  Users who want to set the default character set to something different can do this
+  by setting the environment variable VDR_CHARSET_OVERRIDE to something like
+  ISO-8859-9.
+- Fixed a signed character used as index in cBase64Encoder::NextLine() (thanks
+  to Tobias Grimm).
+- Updated the Spanish and Catalanian OSD texts (thanks to Luca Olivetti).
+- Fixed automatically selecting the preferred subtitle language (based on a patch
+  from Rolf Ahrenberg).
+- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Updated the Polish OSD texts (thanks to Michael Rakowski).
+- Fixed formatting the name section in the VDR man pages (thanks to Tobias Grimm).
+- Updated the Swedish OSD texts (thanks to Magnus Andersson).
+- Added Russian translations to the 'skincurses' and 'pictures' plugins (thanks
+  to Alexander Gross).
+- Fixed displaying the free disk space when entering the recordings menu where the
+  last replayed recording was in a subdirectory, and pressing Back (thanks to Rolf
+  Ahrenberg).
+- Fixed tuning to a live channel after a recording has been stopped using the
+  'Back' key.
+- Resetting a timer's 'pending' flag when it has ended.
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -29,3 +29,7 @@ VDR Plugin 'pictures' Revision History

 - Made the 'pic2mpg' script of the 'pictures' plugin work with uppercase filename
  extensions and relative paths (reported by Stefan Wagner <stefanwag@gmx.at>).
+
+2008-03-14: Version 0.0.7
+
+- Added Russian translations (thanks to Alexander Gross).
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: pictures.c 1.6 2008/02/29 14:38:31 kls Exp $
+ * $Id: pictures.c 1.7 2008/03/14 12:57:19 kls Exp $
 */

 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"

-static const char *VERSION       = "0.0.6";
+static const char *VERSION       = "0.0.7";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");

--- a/PLUGINS/src/pictures/po/ru_RU.po
+++ b/PLUGINS/src/pictures/po/ru_RU.po
@@ -0,0 +1,33 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Alexander Gross <Bikalexander@gmail.com>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"PO-Revision-Date: 2008-03-14 00:45+0100\n"
+"Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
+"Language-Team: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-5\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
+
+msgid "Pictures"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "A simple picture viewer"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Picture directory"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Slide show delay (s)"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD> (<28><><EFBFBD>)"
+
+msgid "No picture directory has been defined!"
+msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -75,3 +75,7 @@ VDR Plugin 'skincurses' Revision History

 - Revised the fix of calculating the scrollbar height in the skins. The scrollbar
  handle now always has a height that is at least the width of the scrollbar.
+
+2008-03-14: Version 0.1.7
+
+- Added Russian translations (thanks to Alexander Gross).
--- a/PLUGINS/src/skincurses/po/ru_RU.po
+++ b/PLUGINS/src/skincurses/po/ru_RU.po
@@ -0,0 +1,29 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Alexander Gross <Bikalexander@gmail.com>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-15 16:04+0200\n"
+"PO-Revision-Date: 2008-03-14 00:21+0100\n"
+"Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
+"Language-Team: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-5\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+msgid "A text only skin"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Key$Mute"
+msgstr "<22><><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Volume "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Text mode"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id: skincurses.c 1.22 2008/02/23 10:38:04 kls Exp $
+ * $Id: skincurses.c 1.23 2008/03/14 12:57:14 kls Exp $
 */

 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>

-static const char *VERSION        = "0.1.6";
+static const char *VERSION        = "0.1.7";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;

--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
 * See the main source file 'vdr.c' for copyright information and
 * how to reach the author.
 *
- * $Id: channels.c 1.59 2008/02/10 15:45:38 kls Exp $
+ * $Id: channels.c 1.60 2008/03/05 16:42:50 kls Exp $
 */

 #include "channels.h"
@@ -947,9 +947,10 @@ int cChannels::GetPrevNormal(int Idx)
  return channel ? Idx : -1;
 }

-void cChannels::ReNumber( void )
+void cChannels::ReNumber(void)
 {
  channelsHashSid.Clear();
+  maxNumber = 0;
  int Number = 1;
  for (cChannel *channel = First(); channel; channel = Next(channel)) {
      if (channel->GroupSep()) {
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
 * See the main source file 'vdr.c' for copyright information and
 * how to reach the author.
 *
- * $Id: config.h 1.307 2008/02/24 12:29:54 kls Exp $
+ * $Id: config.h 1.308 2008/03/16 11:37:13 kls Exp $
 */

 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@

 // VDR's own version number:

-#define VDRVERSION  "1.5.17"
-#define VDRVERSNUM   10517  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.18"
+#define VDRVERSNUM   10518  // Version * 10000 + Major * 100 + Minor

 // The plugin API's version number:

--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
 * See the main source file 'vdr.c' for copyright information and
 * how to reach the author.
 *
- * $Id: device.c 1.155 2008/02/23 13:09:01 kls Exp $
+ * $Id: device.c 1.157 2008/03/09 10:03:34 kls Exp $
 */

 #include "device.h"
@@ -1096,8 +1096,8 @@ void cDevice::EnsureAudioTrack(bool Force)
 void cDevice::EnsureSubtitleTrack(void)
 {
  if (Setup.DisplaySubtitles) {
-     eTrackType PreferredTrack = ttSubtitleFirst;
-     int LanguagePreference = -1;
+     eTrackType PreferredTrack = ttNone;
+     int LanguagePreference = INT_MAX; // higher than the maximum possible value
     for (int i = ttSubtitleFirst; i <= ttSubtitleLast; i++) {
         const tTrackId *TrackId = GetTrack(eTrackType(i));
         if (TrackId && TrackId->id && I18nIsPreferredLanguage(Setup.SubtitleLanguages, TrackId->language, LanguagePreference))
@@ -1416,7 +1416,7 @@ bool cDevice::Receiving(bool CheckAny) const

 #define TS_SCRAMBLING_CONTROL  0xC0
 #define TS_SCRAMBLING_TIMEOUT     3 // seconds to wait until a TS becomes unscrambled
-#define TS_SCRAMBLING_TIME_OK    10 // seconds before a Channel/CAM combination is marked a known to decrypt
+#define TS_SCRAMBLING_TIME_OK    10 // seconds before a Channel/CAM combination is marked as known to decrypt

 void cDevice::Action(void)
 {
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
- *   $Id: si.c 1.24 2008/03/01 12:02:01 kls Exp $
+ *   $Id: si.c 1.25 2008/03/05 17:00:55 kls Exp $
 *                                                                         *
 ***************************************************************************/

@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <iconv.h>
 #include <malloc.h>
+#include <stdlib.h> // for broadcaster stupidity workaround
 #include <string.h>
 #include "descriptor.h"

@@ -340,9 +341,12 @@ bool SetSystemCharacterTable(const char *CharacterTable) {
 // and length are adjusted accordingly.
 static const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte = NULL) {
   const char *cs = "ISO6937";
-   cs = "ISO-8859-9"; // Workaround for broadcaster stupidity: according to
+   // Workaround for broadcaster stupidity: according to
   // "ETSI EN 300 468" the default character set is ISO6937. But unfortunately some
   // broadcasters actually use ISO-8859-9, but fail to correctly announce that.
+   static const char *CharsetOverride = getenv("VDR_CHARSET_OVERRIDE");
+   if (CharsetOverride)
+      cs = CharsetOverride;
   if (isSingleByte)
      *isSingleByte = false;
   if (length <= 0)
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
 * See the main source file 'vdr.c' for copyright information and
 * how to reach the author.
 *
- * $Id: menu.c 1.480 2008/02/24 10:28:46 kls Exp $
+ * $Id: menu.c 1.482 2008/03/16 11:15:28 kls Exp $
 */

 #include "menu.h"
@@ -1913,11 +1913,11 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
  helpKeys = -1;
  Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
  Set();
+  SetFreeDiskDisplay(true);
  if (Current() < 0)
     SetCurrent(First());
  else if (OpenSubMenus && cReplayControl::LastReplayed() && Open(true))
     return;
-  SetFreeDiskDisplay(true);
  Display();
  SetHelpKeys();
 }
@@ -3879,8 +3879,11 @@ void cRecordControl::Stop(void)

 bool cRecordControl::Process(time_t t)
 {
-  if (!recorder || !recorder->IsAttached() || !timer || !timer->Matches(t))
+  if (!recorder || !recorder->IsAttached() || !timer || !timer->Matches(t)) {
+     if (timer)
+        timer->SetPending(false);
     return false;
+     }
  AssertFreeDiskSpace(timer->Priority());
  return true;
 }
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -4,14 +4,15 @@
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
 # Jordi Vil<69> <jvila@tinet.org>, 2003
+# Luca Olivetti <luca@ventoso.org>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Jordi Vil<69> <jvila@tinet.org>\n"
+"PO-Revision-Date: 2008-03-02 19:02+0100\n"
+"Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalanian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -27,10 +28,10 @@ msgid "Can't start Transfer Mode!"
 msgstr "No puc iniciar el mode de transfer<65>ncia!"

 msgid "Starting EPG scan"
-msgstr ""
+msgstr "Iniciant exploraci<63> EPG"

 msgid "No title"
-msgstr ""
+msgstr "Sense t<>tol"

 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
@@ -117,7 +118,7 @@ msgid "Key$Blue"
 msgstr "Blau"

 msgid "Key$Info"
-msgstr ""
+msgstr "Informaci<EFBFBD>"

 msgid "Key$Play"
 msgstr "Reproduir"
@@ -138,10 +139,10 @@ msgid "Key$FastRew"
 msgstr "Enrera r<>pidament"

 msgid "Key$Next"
-msgstr ""
+msgstr "Seg<EFBFBD>ent"

 msgid "Key$Prev"
-msgstr ""
+msgstr "Anterior"

 msgid "Key$Power"
 msgstr "Aturar"
@@ -153,7 +154,7 @@ msgid "Key$Channel-"
 msgstr "Canal -"

 msgid "Key$PrevChannel"
-msgstr ""
+msgstr "Canal anterior"

 msgid "Key$Volume+"
 msgstr "Volum +"
@@ -165,10 +166,10 @@ msgid "Key$Mute"
 msgstr "En silenci"

 msgid "Key$Audio"
-msgstr ""
+msgstr "<EFBFBD>udio"

 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Subt<EFBFBD>tols"

 msgid "Key$Schedule"
 msgstr "Guia de Programaci<63>"
@@ -189,31 +190,31 @@ msgid "Key$Commands"
 msgstr "Ordres"

 msgid "Key$User1"
-msgstr ""
+msgstr "Usuari 1"

 msgid "Key$User2"
-msgstr ""
+msgstr "Usuari 2"

 msgid "Key$User3"
-msgstr ""
+msgstr "Usuari 3"

 msgid "Key$User4"
-msgstr ""
+msgstr "Usuari 4"

 msgid "Key$User5"
-msgstr ""
+msgstr "Usuari 5"

 msgid "Key$User6"
-msgstr ""
+msgstr "Usuari 6"

 msgid "Key$User7"
-msgstr ""
+msgstr "Usuari 7"

 msgid "Key$User8"
-msgstr ""
+msgstr "Usuari 8"

 msgid "Key$User9"
-msgstr ""
+msgstr "Usuari 9"

 msgid "Disk"
 msgstr "Disc"
@@ -222,10 +223,10 @@ msgid "free"
 msgstr "lliure"

 msgid "Free To Air"
-msgstr ""
+msgstr "No codificat"

 msgid "encrypted"
-msgstr ""
+msgstr "Codificat"

 msgid "auto"
 msgstr "auto"
@@ -261,10 +262,10 @@ msgid "Dpid2"
 msgstr "PID AC3 (2)"

 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"

 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"

 msgid "Tpid"
 msgstr "PID Teletext"
@@ -354,7 +355,7 @@ msgid "Stop"
 msgstr "Fi"

 msgid "VPS"
-msgstr ""
+msgstr "VPS"

 msgid "Priority"
 msgstr "Prioritat"
@@ -375,7 +376,7 @@ msgid "Button$On/Off"
 msgstr "On/Off"

 msgid "Button$Info"
-msgstr ""
+msgstr "Informaci<EFBFBD>"

 msgid "Delete timer?"
 msgstr "Esborrar el temporitzador?"
@@ -387,7 +388,7 @@ msgid "Event"
 msgstr "Esdeveniment"

 msgid "Button$Timer"
-msgstr ""
+msgstr "Temporitzador"

 msgid "Button$Record"
 msgstr "Gravar"
@@ -419,23 +420,23 @@ msgstr "Guia de Programaci

 #, c-format
 msgid "This event - %s"
-msgstr ""
+msgstr "Aquest esdeveniment - %s"

 msgid "This event - all channels"
-msgstr ""
+msgstr "Aquest esdeveniment - tots els canals"

 msgid "All events - all channels"
-msgstr ""
+msgstr "Tots els esdeveniments - tots els canals"

 #, c-format
 msgid "Please enter %d digits!"
-msgstr ""
+msgstr "Si us plau introdueixi %d digitos"

 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM no respon"

 msgid "Recording info"
-msgstr ""
+msgstr "Informaci<EFBFBD> de la gravaci<63>"

 msgid "Button$Play"
 msgstr "Reproduir"
@@ -465,13 +466,13 @@ msgid "Recording commands"
 msgstr "Ordres de gravaci<63>"

 msgid "never"
-msgstr ""
+msgstr "mai"

 msgid "skin dependent"
-msgstr ""
+msgstr "dep<EFBFBD>n de l'aparen<65>a"

 msgid "always"
-msgstr ""
+msgstr "sempre"

 msgid "OSD"
 msgstr "Informaci<63> en pantalla"
@@ -480,16 +481,16 @@ msgid "Setup.OSD$Language"
 msgstr "Idioma"

 msgid "Setup.OSD$Skin"
-msgstr ""
+msgstr "Aparen<EFBFBD>a"

 msgid "Setup.OSD$Theme"
-msgstr ""
+msgstr "Tema"

 msgid "Setup.OSD$Left"
-msgstr ""
+msgstr "Esquerra"

 msgid "Setup.OSD$Top"
-msgstr ""
+msgstr "A dalt"

 msgid "Setup.OSD$Width"
 msgstr "Amplada"
@@ -501,28 +502,28 @@ msgid "Setup.OSD$Message time (s)"
 msgstr "Durada dels missatges (s)"

 msgid "Setup.OSD$Use small font"
-msgstr ""
+msgstr "Usar font petita"

 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Antidentat"

 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Font predeterminada"

 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Font petita"

 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Font fixa"

 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Mida font predeterminada (pixel)"

 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Mida font petita"

 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Mida font fixa"

 msgid "Setup.OSD$Channel info position"
 msgstr "Posici<63> de la informaci<63> del canal"
@@ -534,22 +535,22 @@ msgid "top"
 msgstr "a dalt"

 msgid "Setup.OSD$Channel info time (s)"
-msgstr ""
+msgstr "Temps de l'informaci<63> de canal (s)"

 msgid "Setup.OSD$Info on channel switch"
 msgstr "Informaci<63> del canvi de canal"

 msgid "Setup.OSD$Timeout requested channel info"
-msgstr ""
+msgstr "Temps d'espera informaci<63> de canal sol<6F>licitada"

 msgid "Setup.OSD$Scroll pages"
 msgstr "Despla<6C>ar p<>gina sencera"

 msgid "Setup.OSD$Scroll wraps"
-msgstr ""
+msgstr "Despla<EFBFBD>ament circular"

 msgid "Setup.OSD$Menu key closes"
-msgstr ""
+msgstr "Tecla menu tanca"

 msgid "Setup.OSD$Recording directories"
 msgstr "Gravacions en subcarpetes"
@@ -558,7 +559,7 @@ msgid "EPG"
 msgstr "Guia de Programes"

 msgid "Button$Scan"
-msgstr ""
+msgstr "Escaneig"

 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "M<>xim d'Hores a cercar per la Guia"
@@ -567,7 +568,7 @@ msgid "Setup.EPG$EPG bugfix level"
 msgstr "Nivell de correcci<63> de la Guia"

 msgid "Setup.EPG$EPG linger time (min)"
-msgstr ""
+msgstr "Temps manteniment EPG (min)"

 msgid "Setup.EPG$Set system time"
 msgstr "Ajustar l'hora del sistema"
@@ -577,11 +578,11 @@ msgstr "Usar el temps del m

 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
-msgstr ""
+msgstr "Idiomes preferits"

 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
-msgstr ""
+msgstr "Idioma preferit"

 msgid "pan&scan"
 msgstr "pan&scan"
@@ -596,19 +597,19 @@ msgid "no"
 msgstr "no"

 msgid "names only"
-msgstr ""
+msgstr "nom<EFBFBD>s noms"

 msgid "PIDs only"
-msgstr ""
+msgstr "nom<EFBFBD>s PIDs"

 msgid "names and PIDs"
-msgstr ""
+msgstr "noms i PIDs"

 msgid "add new channels"
-msgstr ""
+msgstr "afegir nous canals"

 msgid "add new transponders"
-msgstr ""
+msgstr "afegir nous transponders"

 msgid "DVB"
 msgstr "Tarja DVB"
@@ -620,37 +621,37 @@ msgid "Setup.DVB$Video format"
 msgstr "Format del v<>deo"

 msgid "Setup.DVB$Video display format"
-msgstr ""
+msgstr "Format de visualitzaci<63> de v<>deo"

 msgid "Setup.DVB$Use Dolby Digital"
-msgstr ""
+msgstr "Fer servir Dolby Digital"

 msgid "Setup.DVB$Update channels"
-msgstr ""
+msgstr "Actualitza canals"

 msgid "Setup.DVB$Audio languages"
-msgstr ""
+msgstr "Idiomes d'<27>udio"

 msgid "Setup.DVB$Audio language"
-msgstr ""
+msgstr "Idioma d'<27>udio"

 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Visualitza subt<62>tols"

 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Idiomes subt<62>tols"

 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Idioma subt<62>tols"

 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Despla<EFBFBD>ament subt<62>tols"

 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Transpar<EFBFBD>ncia primer pla subt<62>tols"

 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Transpar<EFBFBD>ncia fons subt<62>tols"

 msgid "LNB"
 msgstr "Configuraci<63> de l'LNB"
@@ -668,16 +669,16 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Freq<65><71>ncia LNB alta (MHz)"

 msgid "CAM reset"
-msgstr ""
+msgstr "Reiniciar CAM"

 msgid "CAM present"
-msgstr ""
+msgstr "CAM present"

 msgid "CAM ready"
-msgstr ""
+msgstr "CAM preparat"

 msgid "CAM"
-msgstr "CI Acc<63>s condicional"
+msgstr "CAM"

 msgid "Button$Menu"
 msgstr "Men<65>"
@@ -686,13 +687,13 @@ msgid "Button$Reset"
 msgstr "Reiniciar"

 msgid "Opening CAM menu..."
-msgstr ""
+msgstr "Obrint menu CAM..."

 msgid "Can't open CAM menu!"
 msgstr "No puc obrir el men<65> de la CAM!"

 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM en <20>s - reiniciar?"

 msgid "Can't reset CAM!"
 msgstr "No puc reiniciar la CAM!"
@@ -725,10 +726,10 @@ msgid "Setup.Recording$Use episode name"
 msgstr "Utilitzar el nom de l'episodi"

 msgid "Setup.Recording$Use VPS"
-msgstr ""
+msgstr "Fer servir VPS"

 msgid "Setup.Recording$VPS margin (s)"
-msgstr ""
+msgstr "Marge VPS (s)"

 msgid "Setup.Recording$Mark instant recording"
 msgstr "Marcar gravaci<63> instant<6E>nia"
@@ -770,22 +771,22 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP Timeout (s)"

 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr ""
+msgstr "Temps d'espera Zap (s)"

 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Temps d'introducci<63> canal (ms)"

 msgid "Setup.Miscellaneous$Initial channel"
-msgstr ""
+msgstr "Canal inicial"

 msgid "Setup.Miscellaneous$as before"
-msgstr ""
+msgstr "anterior"

 msgid "Setup.Miscellaneous$Initial volume"
-msgstr ""
+msgstr "Volum inicial"

 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Sortida d'emerg<72>ncia"

 msgid "Plugins"
 msgstr "Plugins"
@@ -817,7 +818,7 @@ msgid " Stop replaying"
 msgstr " Aturar la reproducci<63>"

 msgid "Button$Audio"
-msgstr ""
+msgstr "<EFBFBD>udio"

 msgid "Button$Pause"
 msgstr "Pausa"
@@ -839,19 +840,19 @@ msgid "Cancel editing?"
 msgstr "Cancel<65>lar l'edici<63>?"

 msgid "No audio available!"
-msgstr ""
+msgstr "No hi ha <20>udio disponible!"

 msgid "No subtitles"
-msgstr ""
+msgstr "Sense subt<62>tols"

 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Subt<EFBFBD>tols"

 msgid "No subtitles available!"
-msgstr ""
+msgstr "No hi ha subt<62>tols disponibles!"

 msgid "Not enough disk space to start recording!"
-msgstr ""
+msgstr "No hi ha espai en disc per a iniciar la gravaci<63>!"

 msgid "No free DVB device to record!"
 msgstr "No hi ha cap dispositiu DVB lliure per gravar!"
@@ -882,7 +883,7 @@ msgid "yes"
 msgstr "s<>"

 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr ""
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc<62><63>2\tdef<65>3\tghi<68>4\tjkl5\tmno<6E><6F>6\tpqrs7\ttuv<75>8\twxyz9"

 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
@@ -909,7 +910,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "No puc apagar, falta la opci<63> -s !"

 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Editant - Apagar de totes maneres?"

 msgid "Recording - shut down anyway?"
 msgstr "Gravant - Apagar de totes maneres?"
@@ -923,10 +924,10 @@ msgstr "Apagar de totes maneres?"

 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "El plugin %s s'activar<61> en %ld minuts, continuar?"

 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Editant - Reiniciar de totes maneres?"

 msgid "Recording - restart anyway?"
 msgstr "Gravant - Reiniciar de totes maneres?"
@@ -939,10 +940,10 @@ msgid "Volume "
 msgstr "Volum "

 msgid "Classic VDR"
-msgstr ""
+msgstr "VDR clasico"

 msgid "ST:TNG Panels"
-msgstr ""
+msgstr "Quadres ST:TNG"

 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
@@ -974,13 +975,13 @@ msgid "Sunday"
 msgstr "Diumenge"

 msgid "Upcoming recording!"
-msgstr ""
+msgstr "Gravaci<EFBFBD> a punt d'iniciar!"

 msgid "Recording started"
-msgstr ""
+msgstr "Gravaci<EFBFBD> comen<65>ada"

 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR s'apagar<61> m<>s tard, prem Power per a for<6F>ar"

 msgid "Press any key to cancel shutdown"
 msgstr "Prem qualsevol tecla per cancel<65>lar l'aturada"
@@ -995,8 +996,8 @@ msgid "Editing process finished"
 msgstr "Proc<6F>s d'edici<63> finalitzat"

 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Prem qualsevol tecla per cancel<65>lar el reinici"

 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR s'apagar<61> en %s minuts"
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -2,14 +2,15 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002, 2006
+# Luca Olivetti <luca@ventoso.org>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
+"POT-Creation-Date: 2008-03-02 17:25+0100\n"
+"PO-Revision-Date: 2008-03-02 19:02+0100\n"
+"Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
@@ -136,10 +137,10 @@ msgid "Key$FastRew"
 msgstr "Retroceso r<>pido"

 msgid "Key$Next"
-msgstr ""
+msgstr "Siguiente"

 msgid "Key$Prev"
-msgstr ""
+msgstr "Anterior"

 msgid "Key$Power"
 msgstr "Apagar"
@@ -151,7 +152,7 @@ msgid "Key$Channel-"
 msgstr "Canal-"

 msgid "Key$PrevChannel"
-msgstr ""
+msgstr "Canal anterior"

 msgid "Key$Volume+"
 msgstr "Volumen+"
@@ -166,7 +167,7 @@ msgid "Key$Audio"
 msgstr "Audio"

 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Subt<EFBFBD>tulos"

 msgid "Key$Schedule"
 msgstr "Gu<47>a de Programaci<63>n"
@@ -187,31 +188,31 @@ msgid "Key$Commands"
 msgstr "<22>rdenes"

 msgid "Key$User1"
-msgstr ""
+msgstr "Usuario 1"

 msgid "Key$User2"
-msgstr ""
+msgstr "Usuario 2"

 msgid "Key$User3"
-msgstr ""
+msgstr "Usuario 3"

 msgid "Key$User4"
-msgstr ""
+msgstr "Usuario 4"

 msgid "Key$User5"
-msgstr ""
+msgstr "Usuario 5"

 msgid "Key$User6"
-msgstr ""
+msgstr "Usuario 6"

 msgid "Key$User7"
-msgstr ""
+msgstr "Usuario 7"

 msgid "Key$User8"
-msgstr ""
+msgstr "Usuario 8"

 msgid "Key$User9"
-msgstr ""
+msgstr "Usuario 9"

 msgid "Disk"
 msgstr "Disco"
@@ -259,10 +260,10 @@ msgid "Dpid2"
 msgstr "Dpid2"

 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"

 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"

 msgid "Tpid"
 msgstr "Tpid"
@@ -430,13 +431,13 @@ msgid "Please enter %d digits!"
 msgstr "<22>Escriba %d d<>gitos!"

 msgid "CAM not responding!"
-msgstr ""
+msgstr "<EFBFBD>CAM no responde!"

 msgid "Recording info"
 msgstr "Informaci<63>n de grabaci<63>n"

 msgid "Button$Play"
-msgstr "Play"
+msgstr "Reproducir"

 msgid "Button$Rewind"
 msgstr "Rebobinar"
@@ -502,25 +503,25 @@ msgid "Setup.OSD$Use small font"
 msgstr "Usar letra peque<75>a"

 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Alisado de fuentes"

 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Fuente por defecto"

 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Fuente peque<75>a"

 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Fuente fija"

 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Tama<EFBFBD>o fuente por defecto (pixel)"

 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Tama<EFBFBD>o fuente peque<75>a (pixel)"

 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Tama<EFBFBD>o fuente fija (pixel)"

 msgid "Setup.OSD$Channel info position"
 msgstr "Posici<63>n para informaci<63>n de canal"
@@ -597,7 +598,7 @@ msgid "names only"
 msgstr "s<>lo nombres"

 msgid "PIDs only"
-msgstr ""
+msgstr "s<EFBFBD>lo PIDs"

 msgid "names and PIDs"
 msgstr "nombres y PIDs"
@@ -633,22 +634,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Idioma de audio"

 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Visualizar subt<62>tulos"

 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Idiomas subt<62>tulos"

 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Idioma subt<62>tulos"

 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Desplazamiento subt<62>tulos"

 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Transparencia primer plano subt<62>tulos"

 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Transparencia fondo subt<62>tulos"

 msgid "LNB"
 msgstr "LNB"
@@ -666,13 +667,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Frecuencia superior del LNB (MHz)"

 msgid "CAM reset"
-msgstr ""
+msgstr "Reset CAM"

 msgid "CAM present"
-msgstr ""
+msgstr "CAM presente"

 msgid "CAM ready"
-msgstr ""
+msgstr "CAM preparado"

 msgid "CAM"
 msgstr "CAM"
@@ -690,7 +691,7 @@ msgid "Can't open CAM menu!"
 msgstr "<22>No se puede abrir el men<65> CAM!"

 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM en uso - <20>reiniciar?"

 msgid "Can't reset CAM!"
 msgstr "<22>No se puede reiniciar CAM!"
@@ -771,19 +772,19 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Considerar canal como visto (sg)"

 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Tiempo introducci<63>n canal (ms)"

 msgid "Setup.Miscellaneous$Initial channel"
-msgstr ""
+msgstr "Canal inicial"

 msgid "Setup.Miscellaneous$as before"
-msgstr ""
+msgstr "anterior"

 msgid "Setup.Miscellaneous$Initial volume"
-msgstr ""
+msgstr "Volumen inicial"

 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Salida de emergencia"

 msgid "Plugins"
 msgstr "Plugins"
@@ -840,16 +841,16 @@ msgid "No audio available!"
 msgstr "<22>No hay audio disponible!"

 msgid "No subtitles"
-msgstr ""
+msgstr "Sin subt<62>tulos"

 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Subt<EFBFBD>tulos"

 msgid "No subtitles available!"
-msgstr ""
+msgstr "<EFBFBD>No hay subt<62>tulos disponibles!"

 msgid "Not enough disk space to start recording!"
-msgstr ""
+msgstr "<EFBFBD>Sin espacio en disco para iniciar grabaci<63>n!"

 msgid "No free DVB device to record!"
 msgstr "<22>Ning<6E>n dispositivo DVB disponible para grabar!"
@@ -907,7 +908,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "<22>No se puede apagar - falta el par<61>metro '-s'!"

 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Editando -<2D>apagar igualmente?"

 msgid "Recording - shut down anyway?"
 msgstr "Grabaci<63>n en curso - <20>apagar igualmente?"
@@ -921,10 +922,10 @@ msgstr "

 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Plugin %s inicia en %ld min, <20>continuar?"

 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Editando - <20>reiniciar igualmente?"

 msgid "Recording - restart anyway?"
 msgstr "Grabaci<63>n en curso - <20>reiniciar igualmente?"
@@ -972,13 +973,13 @@ msgid "Sunday"
 msgstr "Domingo"

 msgid "Upcoming recording!"
-msgstr ""
+msgstr "<EFBFBD>Grabaci<EFBFBD>n a punto de empezar!"

 msgid "Recording started"
 msgstr "Iniciando grabaci<63>n"

 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR se apagar<61> m<>s tarde - pulse Power para forzar"

 msgid "Press any key to cancel shutdown"
 msgstr "Pulse una tecla para interrumpir apagar"
@@ -993,8 +994,8 @@ msgid "Editing process finished"
 msgstr "Proceso de edici<63>n terminado"

 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Pulse cualquier tecla para cancelar reinicio"

 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR se apagar<61> en %s minutos"
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -12,9 +12,9 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2008-02-21 20:29+0100\n"
+"PO-Revision-Date: 2008-03-08 21:06+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team: Italian\n"
+"Language-Team:  Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +26,7 @@ msgid "Channel not available!"
 msgstr "Canale non disponibile!"

 msgid "Can't start Transfer Mode!"
-msgstr "Impossibile avviare la modalit<69> di trasferimento!"
+msgstr "Impossibile avviare mod. trasferimento!"

 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
@@ -55,11 +55,11 @@ msgid "Do not press any key..."
 msgstr "Non premere alcun tasto..."

 msgid "Phase 2: Learning specific key codes"
-msgstr "Fase 2: Apprendimento codici specifici dei tasti"
+msgstr "Fase 2: Apprendimento codici dei tasti"

 #, c-format
 msgid "Press key for '%s'"
-msgstr "Premi il tasto per '%s'"
+msgstr "Premi il tasto '%s'"

 msgid "Press 'Up' to confirm"
 msgstr "Premi 'Su' per confermare"
@@ -71,13 +71,13 @@ msgid "(press 'Up' to go back)"
 msgstr "(premi 'Su' per tornare indietro)"

 msgid "(press 'Down' to end key definition)"
-msgstr "(premi 'Gi<47>' per concludere la definizione tasti)"
+msgstr "(premi 'Gi<47>' per concludere definizione tasti)"

 msgid "(press 'Menu' to skip this key)"
 msgstr "(premi 'Menu' per saltare questo tasto)"

 msgid "Learning Remote Control Keys"
-msgstr "Apprendimento tasti unit<EFBFBD> remota"
+msgstr "Apprendimento tasti RC"

 msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: Salvataggio codici tasti"
@@ -119,10 +119,10 @@ msgid "Key$Blue"
 msgstr "Blu"

 msgid "Key$Info"
-msgstr "Informazioni"
+msgstr "Info"

 msgid "Key$Play"
-msgstr "Riproduzione"
+msgstr "Riproduci"

 msgid "Key$Pause"
 msgstr "Pausa"
@@ -131,7 +131,7 @@ msgid "Key$Stop"
 msgstr "Ferma"

 msgid "Key$Record"
-msgstr "Registrazione"
+msgstr "Registra"

 msgid "Key$FastFwd"
 msgstr "Avanti veloce"
@@ -368,16 +368,16 @@ msgid "File"
 msgstr "Nome"

 msgid "First day"
-msgstr "Primo giorno"
+msgstr "1<EFBFBD> giorno"

 msgid "Timers"
 msgstr "Timer"

 msgid "Button$On/Off"
-msgstr "Attivo/Disattivo"
+msgstr "On/Off"

 msgid "Button$Info"
-msgstr "Informazioni"
+msgstr "Info"

 msgid "Delete timer?"
 msgstr "Eliminare il timer?"
@@ -386,7 +386,7 @@ msgid "Timer still recording - really delete?"
 msgstr "Timer in registrazione - eliminare?"

 msgid "Event"
-msgstr "Eventi"
+msgstr "Evento"

 msgid "Button$Timer"
 msgstr "Timer"
@@ -437,7 +437,7 @@ msgid "CAM not responding!"
 msgstr "La CAM non risponde!"

 msgid "Recording info"
-msgstr "Informazioni registrazione"
+msgstr "Info registrazione"

 msgid "Button$Play"
 msgstr "Riproduci"
@@ -455,13 +455,13 @@ msgid "Commands"
 msgstr "Comandi"

 msgid "Error while accessing recording!"
-msgstr "Errore nell'accedere alla registrazione!"
+msgstr "Errore accesso alla registrazione!"

 msgid "Delete recording?"
 msgstr "Eliminare la registrazione?"

 msgid "Error while deleting recording!"
-msgstr "Errore eliminazione della registrazione!"
+msgstr "Errore eliminazione registrazione!"

 msgid "Recording commands"
 msgstr "Comandi di registrazione"
@@ -518,16 +518,16 @@ msgid "Setup.OSD$Fixed font"
 msgstr "Caratteri fissi"

 msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Dimensione caratteri predefiniti (pixel)"
+msgstr "Dim. caratteri pred. (pixel)"

 msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Dimensione caratteri piccoli (pixel)"
+msgstr "Dim. caratteri piccoli (pixel)"

 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Dimensione caratteri fissi (pixel)"
+msgstr "Dim. caratteri fissi (pixel)"

 msgid "Setup.OSD$Channel info position"
-msgstr "Posizione informazioni canale"
+msgstr "Posizione info canale"

 msgid "bottom"
 msgstr "in basso"
@@ -536,13 +536,13 @@ msgid "top"
 msgstr "in alto"

 msgid "Setup.OSD$Channel info time (s)"
-msgstr "Durata informazioni canale (s)"
+msgstr "Durata info canale (s)"

 msgid "Setup.OSD$Info on channel switch"
-msgstr "Mostra informazioni al cambio canale"
+msgstr "Mostra info al cambio canale"

 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Scadenza richieste informazioni canale"
+msgstr "Scadenza richieste info canale"

 msgid "Setup.OSD$Scroll pages"
 msgstr "Scorri per pagine"
@@ -551,7 +551,7 @@ msgid "Setup.OSD$Scroll wraps"
 msgstr "Scorri riavvolgendo"

 msgid "Setup.OSD$Menu key closes"
-msgstr "Utilizza il tasto Menu per chiudere"
+msgstr "Tasto Menu per chiudere"

 msgid "Setup.OSD$Recording directories"
 msgstr "Directory di registrazione"
@@ -563,13 +563,13 @@ msgid "Button$Scan"
 msgstr "Scansione"

 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Scadenza scansione aggiorn. EPG (ore)"
+msgstr "Scadenza aggiorn. EPG (ore)"

 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Livello correzione EPG"

 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Visualizzazione vecchi dati EPG (min)"
+msgstr "Mostra vecchi dati EPG (min)"

 msgid "Setup.EPG$Set system time"
 msgstr "Imposta orario automatico"
@@ -631,10 +631,10 @@ msgid "Setup.DVB$Update channels"
 msgstr "Aggiorna i canali"

 msgid "Setup.DVB$Audio languages"
-msgstr "Lingue per l'audio"
+msgstr "Lingue audio"

 msgid "Setup.DVB$Audio language"
-msgstr "Lingua per l'audio"
+msgstr "Lingua audio"

 msgid "Setup.DVB$Display subtitles"
 msgstr "Mostra sottotitoli"
@@ -649,7 +649,7 @@ msgid "Setup.DVB$Subtitle offset"
 msgstr "Posizione sottotitoli"

 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Trasparenza primo piano sottotitoli"
+msgstr "Trasparenza sottotitoli"

 msgid "Setup.DVB$Subtitle background transparency"
 msgstr "Trasparenza sfondo sottotitoli"
@@ -733,16 +733,16 @@ msgid "Setup.Recording$VPS margin (s)"
 msgstr "Margine VPS (s)"

 msgid "Setup.Recording$Mark instant recording"
-msgstr "Segna registrazione immediata"
+msgstr "Segna reg. immediata"

 msgid "Setup.Recording$Name instant recording"
-msgstr "Nome registrazione immediata"
+msgstr "Nome reg. immediata"

 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Tempo registrazione immediata (min)"
+msgstr "Tempo reg. immediata (min)"

 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Dimensione massima file video (MB)"
+msgstr "Dim. massima file video (MB)"

 msgid "Setup.Recording$Split edited files"
 msgstr "Dividi i file modificati"
@@ -763,10 +763,10 @@ msgid "Miscellaneous"
 msgstr "Generici"

 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Scadenza minima evento (min)"
+msgstr "Scadenza min. evento (min)"

 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Periodo minimo di inattivit<69> (min)"
+msgstr "Periodo min. inattivit<69> (min)"

 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Scadenza SVDRP (s)"
@@ -787,13 +787,13 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume iniziale"

 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "Uscita d'emergenza"
+msgstr "Uscita di emergenza"

 msgid "Plugins"
 msgstr "Plugins"

 msgid "This plugin has no setup parameters!"
-msgstr "Questo plugin non ha parametri di configurazione!"
+msgstr "Il plugin non ha parametri di configurazione!"

 msgid "Setup"
 msgstr "Opzioni"
@@ -838,7 +838,7 @@ msgid "Stop recording?"
 msgstr "Fermare la registrazione?"

 msgid "Cancel editing?"
-msgstr "Annullare la modifica?"
+msgstr "Annullare le modifiche?"

 msgid "No audio available!"
 msgstr "Nessun audio disponibile!"
@@ -878,13 +878,13 @@ msgid "Editing process already active!"
 msgstr "Processo di modifica gi<67> attivo!"

 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " a<><61>bcde<64><65>fghi<68><69>jklmno<6E>pqrstu<74>vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a<><61>bcde<64><65>fghi<68><69>jklmno<6E>pqrstu<74>vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&<EFBFBD>"

 msgid "yes"
 msgstr "s<>"

 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\ta<74>bc2\tde<64>f3\tghi<68>4\tjkl5\tmno<6E>6\tpqrs7\ttu<74>v8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+<EFBFBD>?{}/:%@&\ta<74>bc2\tde<64>f3\tghi<68>4\tjkl5\tmno<6E>6\tpqrs7\ttu<74>v8\twxyz9"

 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -1,7 +1,7 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Michael Rakowski <mrak@gmx.de>, 2002, 2003
+# Michael Rakowski <mrak@gmx.de>, 2002, 2003, 2008
 # Jaroslaw Swierczynski <swiergot@gmail.com>, 2006
 #
 msgid ""
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Jaroslaw Swierczynski <swiergot@gmail.com>\n"
-"Language-Team: Polish\n"
+"PO-Revision-Date: 2008-03-09 12:59+0100\n"
+"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
+"Language-Team:  Polish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -167,7 +167,7 @@ msgid "Key$Audio"
 msgstr "D<>wi<77>k"

 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Podtytu<EFBFBD>y"

 msgid "Key$Schedule"
 msgstr "Program"
@@ -188,31 +188,31 @@ msgid "Key$Commands"
 msgstr "Polecenia"

 msgid "Key$User1"
-msgstr ""
+msgstr "U<EFBFBD>ytkownik 1"

 msgid "Key$User2"
-msgstr ""
+msgstr "U<EFBFBD>ytkownik 2"

 msgid "Key$User3"
-msgstr ""
+msgstr "U<EFBFBD>ytkownik 3"

 msgid "Key$User4"
-msgstr ""
+msgstr "U<EFBFBD>ytkownik 4"

 msgid "Key$User5"
-msgstr ""
+msgstr "U<EFBFBD>ytkownik 5"

 msgid "Key$User6"
-msgstr ""
+msgstr "U<EFBFBD>ytkownik 6"

 msgid "Key$User7"
-msgstr ""
+msgstr "U<EFBFBD>ytkownik 7"

 msgid "Key$User8"
-msgstr ""
+msgstr "U<EFBFBD>ytkownik 8"

 msgid "Key$User9"
-msgstr ""
+msgstr "U<EFBFBD>ytkownik 9"

 msgid "Disk"
 msgstr "Dysk"
@@ -260,10 +260,10 @@ msgid "Dpid2"
 msgstr "Dpid2"

 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"

 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"

 msgid "Tpid"
 msgstr "Tpid"
@@ -431,7 +431,7 @@ msgid "Please enter %d digits!"
 msgstr "Prosz<73> poda<64> %d cyfr!"

 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM nie reaguje!"

 msgid "Recording info"
 msgstr "Informacje o nagraniu"
@@ -503,25 +503,25 @@ msgid "Setup.OSD$Use small font"
 msgstr "U<>ywaj ma<6D>ej czcionki"

 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Wyg<EFBFBD>adzanie"

 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Standardowa  czcionka"

 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Ma<EFBFBD>a czcionka"

 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Sta<EFBFBD>a czcionka"

 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Standardowa czcionka wyj<79>ciowa (pixle)"

 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Ma<EFBFBD>a czcionka wyj<79>ciowa (pixle)"

 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Ustalona czcionka wyj<79>ciowa (pixle)"

 msgid "Setup.OSD$Channel info position"
 msgstr "Pozycja informacji o kanale"
@@ -634,22 +634,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "J<>zyk d<>wi<77>ku"

 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Obraz napis<69>w"

 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "J<EFBFBD>zyki napisu"

 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "J<EFBFBD>zyk napisu"

 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Zr<EFBFBD>wnowa<EFBFBD>y<EFBFBD> napis"

 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Prze<EFBFBD>rocze podtytu<74><75>w: Prz<72>d"

 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Prze<EFBFBD>rocze podtytu<74><75>w: T<>o"

 msgid "LNB"
 msgstr "LNB"
@@ -667,13 +667,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "G<>rna cz<63>stotliwo<77><6F> LNB (MHz)"

 msgid "CAM reset"
-msgstr ""
+msgstr "CAM zresetowany"

 msgid "CAM present"
-msgstr ""
+msgstr "CAM obecny"

 msgid "CAM ready"
-msgstr ""
+msgstr "CAM gotowy"

 msgid "CAM"
 msgstr "CAM"
@@ -691,7 +691,7 @@ msgid "Can't open CAM menu!"
 msgstr "Nie mo<6D>na otworzy<7A> menu CAM!"

 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM jest w u<>yciu - naprawd<77> zresetowa<77>?"

 msgid "Can't reset CAM!"
 msgstr "Nie mo<6D>na zresetowa<77> CAM!"
@@ -772,7 +772,7 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Czas oczekiwania na zap (s)"

 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Min<EFBFBD><EFBFBD> czas wej<65>cia do kana<6E>u"

 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Pocz<63>tkowy kana<6E>"
@@ -784,7 +784,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Pocz<63>tkowa g<>o<EFBFBD>no<6E><6F>"

 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Wyj<EFBFBD>cie awaryjne"

 msgid "Plugins"
 msgstr "Wtyczki"
@@ -841,13 +841,13 @@ msgid "No audio available!"
 msgstr "D<>wi<77>k nie jest dost<73>pny!"

 msgid "No subtitles"
-msgstr ""
+msgstr "Brak napis<69>w"

 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Napisy"

 msgid "No subtitles available!"
-msgstr ""
+msgstr "Napisy nie s<> dost<73>pne"

 msgid "Not enough disk space to start recording!"
 msgstr "Brak miejsca na dysku do nagrywania!"
@@ -908,7 +908,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nie mo<6D>na wy<77><79>czy<7A> - nie podano opcji '-s'!"

 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Monta<EFBFBD> w trakcie  - Wy<57><79>czy<7A> mimo to?"

 msgid "Recording - shut down anyway?"
 msgstr "Trwa nagrywanie - wy<77><79>czy<7A> mimo to?"
@@ -922,10 +922,10 @@ msgstr "wy

 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Wtyczka %s obudzi si<73> za %ld min, kontynuowa<77>?"

 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Monta<EFBFBD> w trakcie  - Zrestartowa<77> mimo to?"

 msgid "Recording - restart anyway?"
 msgstr "Trwa nagrywanie - zrestartowa<77> mimo to?"
@@ -979,7 +979,7 @@ msgid "Recording started"
 msgstr "Rozpocz<63>to nagrywanie"

 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR zostanie wy<77><79>czony p<><70>niej - Naci<63>nij Wy<57><79>cz (Power) aby wymusi<73>"

 msgid "Press any key to cancel shutdown"
 msgstr "Naci<63>nij dowolny klawisz aby nie wy<77><79>cza<7A>"
@@ -994,8 +994,8 @@ msgid "Editing process finished"
 msgstr "Proces edycji zako<6B>czony"

 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Naci<EFBFBD>nij dowolny klawisz aby nie zrestartowa<77>"

 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR zostanie wy<77><79>czony za %s minut"
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -4,14 +4,15 @@
 # Tomas Prybil <tomas@prybil.se>, 2002, 2003, 2005, 2006
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
 # Tomas Berglund <tomber@telia.com>, 2008
+# Magnus Andersson <svankan@bahnhof.se>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2008-02-24 13:27+0200\n"
-"Last-Translator: Tomas Berglund <tomber@telia.com>\n"
+"PO-Revision-Date: 2008-03-12 18:25+0100\n"
+"Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -189,31 +190,31 @@ msgid "Key$Commands"
 msgstr "Kommandon"

 msgid "Key$User1"
-msgstr ""
+msgstr "Anv<EFBFBD>ndare1"

 msgid "Key$User2"
-msgstr ""
+msgstr "Anv<EFBFBD>ndare2"

 msgid "Key$User3"
-msgstr ""
+msgstr "Anv<EFBFBD>ndare3"

 msgid "Key$User4"
-msgstr ""
+msgstr "Anv<EFBFBD>ndare4"

 msgid "Key$User5"
-msgstr ""
+msgstr "Anv<EFBFBD>ndare5"

 msgid "Key$User6"
-msgstr ""
+msgstr "Anv<EFBFBD>ndare6"

 msgid "Key$User7"
-msgstr ""
+msgstr "Anv<EFBFBD>ndare7"

 msgid "Key$User8"
-msgstr ""
+msgstr "Anv<EFBFBD>ndare8"

 msgid "Key$User9"
-msgstr ""
+msgstr "Anv<EFBFBD>ndare9"

 msgid "Disk"
 msgstr "Disk"
@@ -432,7 +433,7 @@ msgid "Please enter %d digits!"
 msgstr "Mata in %d siffror!"

 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM svarar inte!"

 msgid "Recording info"
 msgstr "Inspelning"
@@ -785,7 +786,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Ljudstyrka vid uppstart"

 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Of<EFBFBD>rutsedd avslutning"

 msgid "Plugins"
 msgstr "Moduler"
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,14 +1,14 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007
+# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"PO-Revision-Date: 2008-03-07 14:17+0200\n"
 "Last-Translator: Yarema Aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
 "MIME-Version: 1.0\n"
@@ -187,31 +187,31 @@ msgid "Key$Commands"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

 msgid "Key$User1"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1"

 msgid "Key$User2"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2"

 msgid "Key$User3"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>3"

 msgid "Key$User4"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>4"

 msgid "Key$User5"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>5"

 msgid "Key$User6"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>6"

 msgid "Key$User7"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>7"

 msgid "Key$User8"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>8"

 msgid "Key$User9"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>8"

 msgid "Disk"
 msgstr "<22><><EFBFBD><EFBFBD>"
@@ -259,10 +259,10 @@ msgid "Dpid2"
 msgstr "Dpid2 (AC3 2)"

 msgid "Spid1"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>1"

 msgid "Spid2"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>2"

 msgid "Tpid"
 msgstr "Tpid (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
@@ -645,10 +645,10 @@ msgid "Setup.DVB$Subtitle offset"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

 msgid "LNB"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -783,7 +783,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"

 msgid "Plugins"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
 * See the main source file 'vdr.c' for copyright information and
 * how to reach the author.
 *
- * $Id: tools.c 1.144 2008/02/29 13:16:39 kls Exp $
+ * $Id: tools.c 1.145 2008/03/05 17:23:47 kls Exp $
 */

 #include "tools.h"
@@ -1102,7 +1102,7 @@ const char *cBase64Encoder::NextLine(void)
  int r = 0;
  while (i < length && r < maxResult - 3) {
        result[r++] = b64[(data[i] >> 2) & 0x3F];
-        char c = (data[i] << 4) & 0x3F;
+        uchar c = (data[i] << 4) & 0x3F;
        if (++i < length)
           c |= (data[i] >> 4) & 0x0F;
        result[r++] = b64[c];
--- a/vdr.1
+++ b/vdr.1
@@ -8,11 +8,11 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.32 2008/02/10 14:23:12 kls Exp $
+.\" $Id: vdr.1 1.33 2008/03/09 16:07:06 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
-vdr - the Video Disk Recorder
+vdr \- the Video Disk Recorder
 .SH SYNOPSIS
 .B vdr
 [options]
--- a/vdr.5
+++ b/vdr.5
@@ -8,11 +8,11 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.67 2008/02/10 14:25:07 kls Exp $
+.\" $Id: vdr.5 1.68 2008/03/09 15:46:57 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
-vdr file formats - the Video Disk Recorder Files
+vdr_files \- the Video Disk Recorder Files
 .SH DESCRIPTION
 This page describes the formats of the various files \fBvdr\fR uses to
 store configuration data and recordings.
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
 *
 * The project's page is at http://www.cadsoft.de/vdr
 *
- * $Id: vdr.c 1.312 2008/02/23 15:36:01 kls Exp $
+ * $Id: vdr.c 1.313 2008/03/14 13:22:39 kls Exp $
 */

 #include <getopt.h>
@@ -546,6 +546,7 @@ int main(int argc, char *argv[])
  int MaxLatencyTime = 0;
  bool InhibitEpgScan = false;
  bool IsInfoMenu = false;
+  bool CheckHasProgramme = false;
  cSkin *CurrentSkin = NULL;

  // Load plugins:
@@ -730,7 +731,7 @@ int main(int argc, char *argv[])
        // Make sure we have a visible programme in case device usage has changed:
        if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
           static time_t lastTime = 0;
-           if (!Menu && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
+           if ((!Menu || CheckHasProgramme) && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
              cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
              if (Channel && (Channel->Vpid() || Channel->Apid(0))) {
                 if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
@@ -739,6 +740,7 @@ int main(int argc, char *argv[])
                 }
              lastTime = Now; // don't do this too often
              LastTimerChannel = -1;
+              CheckHasProgramme = false;
              }
           }
        // Restart the Watchdog timer:
@@ -1120,6 +1122,7 @@ int main(int argc, char *argv[])
                            DELETE_MENU;
                            cControl::Shutdown();
                            Menu = new cMenuMain(osRecordings);
+                            CheckHasProgramme = true; // to have live tv after stopping replay with 'Back'
                            break;
             case osReplay: DELETE_MENU;
                            cControl::Shutdown();