Version 1.4.2-3

- Added --remove-destination to the 'cp' command for binaries in the Makefiles of the plugins (thanks to Rolf Ahrenberg). - The 'skincurses' plugin now adjusts the size of the OSD to the size of the console window. - Fixed deleting expired VPS timers (under certain conditions a timer could have been deleted before it even started recording). - Updated the Hungarian language texts (thanks to Istvan Koenigsberger and Guido Josten). - Fixed handling video directory updates in case the timestamp of the .update file is in the future (thanks to Petri Hintukainen).
2025-03-01 10:50:46 +00:00 · 2006-09-17 18:00:00 +02:00
parent 0b99b3aac1
commit d495ed1a3e
16 changed files with 137 additions and 115 deletions
--- a/4
+++ b/4
@@ -1006,6 +1006,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
 for reporting a bug in handling empty titles in cEvent::FixEpgBugs()
 for suggesting to replace the "Really restart?" prompt in the call to
 cPluginManager::Active() in menu.c to "restart anyway?"
+ for adding --remove-destination to the 'cp' command for binaries in the Makefiles of
+ the plugins

 Ralf Klueber <ralf.klueber@vodafone.com>
 for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1817,6 +1819,8 @@ Petri Hintukainen <Petri.Hintukainen@hut.fi>
 have been several reports that it causes more problems than it solves
 for suggesting to add --remove-destination to the 'cp' command for binaries in
 the Makefile to avoid a crash in case a new version is installed on a running system
+ for fixing handling video directory updates in case the timestamp of the .update
+ file is in the future

 Marcel Schaeben <mts280@gmx.de>
 for his "Easy Input" patch
--- a/12
+++ b/12
@@ -4914,3 +4914,15 @@ Video Disk Recorder Revision History
  to Alexander Rieger).
 - Implemented a copy constructor for cTimer (thanks to Udo Richter for reporting that
  an assignment in svdrp.c didn't use the cTimer::operator=()).
+
+2006-09-17: Version 1.4.2-3
+
+- Added --remove-destination to the 'cp' command for binaries in the Makefiles of
+  the plugins (thanks to Rolf Ahrenberg).
+- The 'skincurses' plugin now adjusts the size of the OSD to the size of the console
+  window.
+- Fixed deleting expired VPS timers (under certain conditions a timer could have been
+  deleted before it even started recording).
+- Updated the Hungarian language texts (thanks to Istvan Koenigsberger and Guido Josten).
+- Fixed handling video directory updates in case the timestamp of the .update file
+  is in the future (thanks to Petri Hintukainen).
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.14 2006/04/24 17:20:58 kls Exp $
+# $Id: Makefile 1.15 2006/09/09 12:38:35 kls Exp $

 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so

 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2006/04/24 17:21:00 kls Exp $
+# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $

 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so

 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.7 2006/06/24 09:09:54 kls Exp $
+# $Id: Makefile 1.8 2006/09/09 12:38:35 kls Exp $

 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -69,11 +69,11 @@ all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so

 libvdr-$(PLUGIN1).so: $(PLUGIN1).o
 	$(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

 libvdr-$(PLUGIN2).so: $(PLUGIN2).o
 	$(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -35,3 +35,7 @@ VDR Plugin 'skincurses' Revision History
 - Fixed handling tabbed item display.
 - When the 'skincurses' plugin is loaded, it automatically sets the 'curses'
  skin as the current one.
+
+2006-09-10: Version 0.0.8
+
+- The size of the OSD is now adjusted to the size of the console window.
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.6 2006/04/24 17:21:02 kls Exp $
+# $Id: Makefile 1.7 2006/09/09 12:38:35 kls Exp $

 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so

 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncurses -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
--- 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.10 2006/06/03 14:20:39 kls Exp $
+ * $Id: skincurses.c 1.11 2006/09/10 14:23:55 kls Exp $
 */

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

-static const char *VERSION        = "0.0.7";
+static const char *VERSION        = "0.0.8";
 static const char *DESCRIPTION    = "A text only skin";
 static const char *MAINMENUENTRY  = NULL;

@@ -53,8 +53,8 @@ static int clrMessage[] = {
  clrRed
  };

-#define OsdWidth  50//XXX
-#define OsdHeight 20//XXX
+static int OsdWidth = 50;
+static int OsdHeight = 20;

 class cCursesOsd : public cOsd {
 private:
@@ -780,9 +780,14 @@ bool cPluginSkinCurses::ProcessArgs(int argc, char *argv[])
 bool cPluginSkinCurses::Initialize(void)
 {
  // Initialize any background activities the plugin shall perform.
-  initscr();
+  WINDOW *w = initscr();
+  if (w) {
+     OsdWidth  = w->_maxx - w->_begx + 1;
+     OsdHeight = w->_maxy - w->_begy + 1;
     return true;
     }
+  return false;
+}

 bool cPluginSkinCurses::Start(void)
 {
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2006/04/24 17:21:03 kls Exp $
+# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $

 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so

 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.12 2006/04/24 17:21:04 kls Exp $
+# $Id: Makefile 1.13 2006/09/09 12:38:35 kls Exp $

 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so

 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.6 2006/04/24 17:21:06 kls Exp $
+# $Id: Makefile 1.7 2006/09/09 12:38:35 kls Exp $

 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so

 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
--- 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.269 2006/09/04 17:44:12 kls Exp $
+ * $Id: config.h 1.270 2006/09/10 14:09:31 kls Exp $
 */

 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@

 // VDR's own version number:

-#define VDRVERSION  "1.4.2-2"
+#define VDRVERSION  "1.4.2-3"
 #define VDRVERSNUM   10402  // Version * 10000 + Major * 100 + Minor

 // The plugin API's version number:
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
 * See the main source file 'vdr.c' for copyright information and
 * how to reach the author.
 *
- * $Id: i18n.c 1.281 2006/05/05 13:26:09 kls Exp $
+ * $Id: i18n.c 1.282 2006/09/16 09:08:30 kls Exp $
 *
 * Translations provided by:
 *
@@ -20,7 +20,7 @@
 * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
 * Swedish     Tomas Prybil <tomas@prybil.se>, Jan Ekholm <chakie@infa.abo.fi>
 * Romanian    Paul Lacatus <paul@campina.iiruc.ro>, Lucian Muresan <lucianm@users.sourceforge.net>
- * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>
+ * Hungarian   Istvan & Silvia Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>
 * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com>, Jordi Vil<69> <jvila@tinet.org>
 * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>, Oleg Roitburd <oleg@roitburd.de>
 * Croatian    Drazen Dupor <drazen.dupor@dupor.com>, Dino Ravnic <dino.ravnic@fer.hr>
@@ -231,7 +231,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Timers",
    "Timer-e",
-    "Felv<EFBFBD>tel beprogramoz<6F>sa",
+    "Id<EFBFBD>z<EFBFBD>t<EFBFBD>",
    "Temporitzadors",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Termini",
@@ -275,7 +275,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> E<><45><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Inspelning",
    "Detaliile <20>nregistr<74>rii",
-    "",// TODO
+    "Felv<EFBFBD>tel",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",// TODO
@@ -385,7 +385,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "<EFBFBD>ndra timer",
    "Modificare timer",
-    "Felv<EFBFBD>tel beprogramoz<6F>s<EFBFBD>nak megv<67>ltoztat<61>sa",
+    "Id<EFBFBD>z<EFBFBD>t<EFBFBD> megv<67>ltoztat<61>sa",
    "Editar temporitzador",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Ure<EFBFBD>ivanje termina",
@@ -429,7 +429,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Info",
    "Info",
-    "",//TODO
+    "Inform<EFBFBD>ci<EFBFBD>",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Info",
@@ -473,7 +473,7 @@ const tI18nPhrase Phrases[] = {
    "",//TODO
    "Den h<>r s<>ndningen - %s",
    "Aceast<EFBFBD> emisiune - %s",
-    "",//TODO
+    "Ez az ad<61>s - %s",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - %s",
    "",//TODO
@@ -495,7 +495,7 @@ const tI18nPhrase Phrases[] = {
    "",//TODO
    "Den h<>r s<>ndningen - alla kanaler",
    "Aceast<EFBFBD> emisiune - toate canalele",
-    "",//TODO
+    "Ez az ad<61>s - <20>sszes ad<61>",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",//TODO
@@ -517,7 +517,7 @@ const tI18nPhrase Phrases[] = {
    "",//TODO
    "Alla tillf<6C>llen - alla kanaler",
    "Toate emisiunile - toate canalele",
-    "",//TODO
+    "Az <20>sszes ad<61>s - az <20>sszes ad<61>",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",//TODO
@@ -694,7 +694,7 @@ const tI18nPhrase Phrases[] = {
    "",// TODO
    "Timer",
    "Timer",
-    "",// TODO
+    "Id<EFBFBD>z<EFBFBD>t<EFBFBD>",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",// TODO
@@ -738,7 +738,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Info",
    "Info",
-    "",//TODO
+    "Inform<EFBFBD>ci<EFBFBD>",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Info",
@@ -1090,7 +1090,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Skanna",
    "C<EFBFBD>utare canale",
-    "",//TODO
+    "Ad<EFBFBD>skeres<EFBFBD>s",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Pretra<EFBFBD>i",
@@ -1112,7 +1112,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Ljud",
    "Sunet",
-    "",// TODO
+    "Hang",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",// TODO
@@ -1157,7 +1157,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;?",
    "Ta bort timern?",
    "<EFBFBD>terg timer-ul?",
-    "Felv<EFBFBD>tel beprogramoz<6F>s<EFBFBD>nak t<>rl<72>se?",
+    "Id<EFBFBD>z<EFBFBD>t<EFBFBD> t<>rl<72>se?",
    "Esborrar el temporitzador?",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?",
    "Obrisati termin?",
@@ -1708,7 +1708,7 @@ const tI18nPhrase Phrases[] = {
    "",//TODO
    "Okodad",
    "FTA (necriptat)",
-    "",//TODO
+    "K<EFBFBD>dolatlan",
    "",//TODO
    "FTA (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)",
    "",//TODO
@@ -1730,7 +1730,7 @@ const tI18nPhrase Phrases[] = {
    "",//TODO
    "krypterad",
    "criptat",
-    "",//TODO
+    "K<EFBFBD>dolt",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",//TODO
@@ -2061,7 +2061,7 @@ const tI18nPhrase Phrases[] = {
    "VPS",
    "VPS",
    "VPS",
-    "",// TODO
+    "VPS",
    "",// TODO
    "VPS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "VPS", // hrv
@@ -2172,7 +2172,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!",
    "Kanalen anv<6E>nds av en timer!",
    "Canalul este utilizat de un timer!",
-    "Csatorn<EFBFBD>t m<>s haszn<7A>lja!",
+    "Az ad<61>t az id<69>z<EFBFBD>t<EFBFBD> haszn<7A>lja!",
    "Canal en <20>s per un temporitzador!",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!",
    "Program je trenutno zauzet terminom za snimanje",
@@ -2194,7 +2194,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!",
    "Om<EFBFBD>jligt att byta kanal!",
    "Nu pot comuta canalul!",
-    "Csatorn<EFBFBD>t nem lehet <EFBFBD>tkapcsolni!",
+    "Az ad<EFBFBD>t nem lehet elkapcsolni",
    "No puc canviar de canal!",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>!",
    "Ne mogu prebaciti program!",
@@ -2304,7 +2304,7 @@ const tI18nPhrase Phrases[] = {
    "",//TODO
    "strax VPS inspelning...",
    "Urmeaz<EFBFBD> o <20>nregistrare VPS!",
-    "",//TODO
+    "VPS-felv<6C>tel r<>gt<67>n kezd<7A>dik!",
    "",//TODO
    "VPS-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",//TODO
@@ -2348,7 +2348,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!",
    "Kanalen <20>r inte tillg<6C>nglig!",
    "Canal indisponibil",
-    "A csatorna nem el<65>rhet<65>",
+    "Az ad<61> nem el<65>rhet<65>",
    "Canal no disponible!",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!",
    "Program nije dostupan!",
@@ -2370,7 +2370,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!",
    "Kanalinst<EFBFBD>llningarna <20>r ej unika!",
    "Parametrii canalului nu sunt univoci!",
-    "A csatornabe<EFBFBD>ll<EFBFBD>t<EFBFBD>sok nem egy<67>rtelm<6C>ek",
+    "Az ad<61>be<EFBFBD>ll<EFBFBD>t<EFBFBD>sok nem egy<67>rtelm<6C>ek",
    "Propietats del canal duplicades!",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!",
    "Parametri programa nisu jednozna<6E>ni!",
@@ -2392,7 +2392,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)!",
    "Kanalen <20>r l<>st (inspelning p<>g<EFBFBD>r)!",
    "Canal blocat (<28>nregistrare)!",
-    "Csatorna hozz<7A>f<EFBFBD>rhetetlen (felv<6C>tel)!",
+    "Az ad<61> blokkolva (felv<6C>tel)!",
    "Canal bloquejat (gravant)!",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)!",
    "Program blokiran (snimanje)!",
@@ -2524,7 +2524,7 @@ const tI18nPhrase Phrases[] = {
    "",//TODO
    "Otillr<EFBFBD>cklingt diskutrymme f<>r inspelning!",
    "Insuficient spa<70>iul pe disc pentru <20>nregistrare!",
-    "",//TODO
+    "Nincs elegend<6E> hely a felv<6C>telre",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",//TODO
@@ -2568,7 +2568,7 @@ const tI18nPhrase Phrases[] = {
    "",//TODO
    "<EFBFBD>ppnar CAM menyn...",
    "Deschid meniul CAM...",
-    "",//TODO
+    "A CAM-men<65> nyit<69>s alatt...",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (CAM)",
    "",//TODO
@@ -2612,7 +2612,7 @@ const tI18nPhrase Phrases[] = {
    "",//TODO
    "<EFBFBD>terst<EFBFBD>ller CAM ...",
    "Se reseteaz<61> CAM...",
-    "",//TODO
+    "A CAM <20>jra indul...",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CAM...",
    "",//TODO
@@ -2678,7 +2678,7 @@ const tI18nPhrase Phrases[] = {
    "",//TODO
    "Mata in %d siffror!",
    "V<EFBFBD> rog introduce<63>i %d cifre!",
-    "",//TODO
+    "<EFBFBD>ss<EFBFBD>n be %d sz<73>mot!",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d <20><><EFBFBD><EFBFBD><EFBFBD>",
    "",//TODO
@@ -2700,7 +2700,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",
    "Ljud saknas!",
    "Lipse<EFBFBD>te sunetul!",
-    "",//TODO
+    "Hang nem lehets<74>ges!",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>!",
    "Audio nedostupan",
@@ -2988,7 +2988,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Skin",
    "Skin",
-    "",// TODO
+    "Men<EFBFBD> n<>zet",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Povr<EFBFBD>ina",
@@ -3010,7 +3010,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Tema",
    "Tem<EFBFBD>",
-    "",// TODO
+    "T<EFBFBD>ma",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Tema",
@@ -3032,7 +3032,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "V<EFBFBD>nster",
    "St<EFBFBD>nga",
-    "",// TODO
+    "Balra",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",
    "Lijevo",
@@ -3054,7 +3054,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "<EFBFBD>vre",
    "Sus",
-    "",// TODO
+    "Fent",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Gore",
@@ -3142,7 +3142,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Anv<EFBFBD>nd liten font",
    "Utilizare fonturi mici",
-    "",// TODO
+    "Kisbet<EFBFBD>t haszn<7A>lni",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",
    "Koristi mala slova",
@@ -3164,7 +3164,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "aldrig",
    "niciodat<EFBFBD>",
-    "",// TODO
+    "soha",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "nikada",
@@ -3186,7 +3186,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "skin beroende",
    "dep. de skin",
-    "",// TODO
+    "Men<EFBFBD> n<>zet<65>t<EFBFBD>l f<>gg<67>en",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",
    "ovisno o povr<76>ini",
@@ -3208,7 +3208,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "alltid",
    "<EFBFBD>ntotdeauna",
-    "",// TODO
+    "mindig",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "uvijek",
@@ -3230,7 +3230,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Placering av kanalinformation",
    "Pozi<EFBFBD>ia informa<6D>iilor despre canal",
-    "Csatorna-Inf<EFBFBD> pozici<63>ja",
+    "Ad<EFBFBD>sinform<EFBFBD>ci<EFBFBD> pozici<63>ja",
    "Posici<EFBFBD> de la informaci<63> del canal",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Pozicija informacije o programu",
@@ -3252,7 +3252,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (<28>)",
    "Kanal information (s)",
    "Durata afi<66><69>rii info-canal (s)",
-    "",// TODO
+    "Ad<EFBFBD>sinform<EFBFBD>ci<EFBFBD> felt<6C>ntet<65>s<EFBFBD>nek id<69>tartama (s)",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)",
    "Vrijeme prikaza informacije o programu (s)",
@@ -3274,7 +3274,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Information vid kanalbyte",
    "Informa<EFBFBD>ii la comutarea canalului",
-    "Inf<EFBFBD> a csatorna v<>lt<6C>s<EFBFBD>n<EFBFBD>l",
+    "Inform<EFBFBD>ci<EFBFBD> az ad<61> v<>lt<6C>s<EFBFBD>n<EFBFBD>l",
    "Informaci<EFBFBD> del canvi de canal",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Informacije kod promjene kanala",
@@ -3296,7 +3296,7 @@ const tI18nPhrase Phrases[] = {
    "", // TODO
    "Timeout f<>r kanalinformation",
    "Durata afi<66><69>rii informa<6D>ii canal",
-    "", // TODO
+    "A lek<65>rdezett ad<61>sinform<72>ci<63> bez<65>r<EFBFBD>sa",
    "", // TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "", // TODO
@@ -3340,7 +3340,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>",
    "Rulla texten",
    "Derulare circular<61>",
-    "",// TODO
+    "Korl<EFBFBD>tlan l<>ptet<65>s",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "S kraja sko<6B>i na po<70>etak",
@@ -3362,7 +3362,7 @@ const tI18nPhrase Phrases[] = {
    "",// TODO
    "Menyknappen st<73>nger",
    "Tasta 'Meniu' <20>nchide",
-    "",// TODO
+    "A men<65> gomb z<>r",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",// TODO
@@ -3406,7 +3406,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> EPG <20><> <20><><EFBFBD><EFBFBD>",
    "EPG s<>kning timeout",
    "Interval achizi<7A>ie EPG (h)",
-    "Fennmaradt id<69> az EPG-g (h)",
+    "Fennmaradt id<69> az EPG-<EFBFBD>j<EFBFBD>t<EFBFBD>sig (h)",
    "M<EFBFBD>xim d'Hores a cercar per la Guia",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28>)",
    "Vrijeme do EPG pregleda (h)",
@@ -3450,7 +3450,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD>)",
    "Visa gammal information (min)",
    "Date EPG expirate cel mult (min)",
-    "",// TODO
+    "R<EFBFBD>gi EPG adatok megmutat<61>sa (perc)",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)",
    "Prika<EFBFBD>i stare EPG podatke (min)",
@@ -3516,7 +3516,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "<EFBFBD>nskade spr<70>k",
    "Limbi preferate",
-    "",// TODO
+    "Kedvenc nyelvek",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)",
    "Preferirani jezici",
@@ -3538,7 +3538,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "<EFBFBD>nskat spr<70>k",
    "Limba preferat<61>",
-    "",// TODO
+    "Kedvenc nyelv",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Preferirani jezik",
@@ -3692,7 +3692,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> Dolby Digital",
    "Anv<EFBFBD>nd Dolby Digital",
    "Sunet Dolby Digital",
-    "",//TODO
+    "Dolby-Digital hangot haszn<7A>lni",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Dolby Digital",
    "Koristi Dolby Digital",
@@ -3714,7 +3714,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Uppdatera kanaler",
    "Actualizare canale",
-    "",// TODO
+    "Ad<EFBFBD>k aktualiz<69>l<EFBFBD>sa",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Aktualiziraj programe",
@@ -3736,7 +3736,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "bara namn",
    "doar numele",
-    "",// TODO
+    "kiz<EFBFBD>r<EFBFBD>lag nevek",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "samo imena",
@@ -3758,7 +3758,7 @@ const tI18nPhrase Phrases[] = {
    "",// TODO
    "bara PIDs",
    "Numai PID-uri",
-    "",// TODO
+    "kiz<EFBFBD>r<EFBFBD>lag PID-k",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PID<49>",
    "",// TODO
@@ -3780,7 +3780,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> PIDs",
    "namn och PID",
    "nume si PID-uri",
-    "",// TODO
+    "nevek <20>s PID-k",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> PID<49>",
    "imena i identifikatore (PIDs)",
@@ -3802,7 +3802,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "l<EFBFBD>gg till nya kanaler",
    "ad<EFBFBD>ugare canale noi",
-    "",// TODO
+    "<EFBFBD>j ad<61>k hozz<7A>ad<61>sa",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "dodaj nove programe",
@@ -3824,7 +3824,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "l<EFBFBD>gg till nya transponders",
    "ad<EFBFBD>ugare transpondere noi",
-    "",// TODO
+    "<EFBFBD>j transponder hozz<7A>ad<61>sa",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "dodaj nove transpondere", // hrv TODO transponderi == odasilja<6A>i?
@@ -3846,7 +3846,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",
    "Antal ljudspr<70>k",
    "Limbi sunet",
-    "",//TODO
+    "Audio-nyelvek",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD>)",
    "Audio jezici",
@@ -3868,7 +3868,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",
    "Ljudspr<EFBFBD>k",
    "Limba sunetului",
-    "",//TODO
+    "Audio-nyelv",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Audio jezik",
@@ -4000,7 +4000,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD>)",
    "Marginal f<>r start (min)",
    "Marj<EFBFBD> la pornire (min)",
-    "Id<EFBFBD>eltol<EFBFBD>d<EFBFBD>s a kezd<7A>sn<73>l (min)",
+    "Id<EFBFBD>eltol<EFBFBD>d<EFBFBD>s a kezd<7A>sn<73>l (perc)",
    "Marge d'inici de gravaci<63> (min)",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)",
    "Rezerva na po<70>etku snimanja (min)",
@@ -4022,7 +4022,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD>)",
    "Marginal f<>r stopp (min)",
    "Marj<EFBFBD> la oprire (min)",
-    "Id<EFBFBD>eltol<EFBFBD>d<EFBFBD>s a befejez<65>sn<73>l",
+    "Id<EFBFBD>eltol<EFBFBD>d<EFBFBD>s a befejez<65>sn<73>l (perc)",
    "Marge de fi de gravaci<63> (min)",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)",
    "Rezerva na kraju (min)",
@@ -4176,7 +4176,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> VPS",
    "Anv<EFBFBD>nd VPS",
    "Utilizeaz<EFBFBD> VPS",
-    "",// TODO
+    "VPS-t haszn<7A>lni",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> VPS",
    "Koristi VPS",
@@ -4198,7 +4198,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> VPS (<28>)",
    "VPS marginal (s)",
    "Marj<EFBFBD> de timp la utilizare VPS (s)",
-    "",// TODO
+    "Id<EFBFBD>eltol<EFBFBD>d<EFBFBD>s VPS-n<>l (s)",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> VPS (<28><><EFBFBD>)",
    "Vremenska rezerva kod VPS (s)",
@@ -4264,7 +4264,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD>)",
    "Direktinspelning l<>ngd (min)",
    "Timpul de <20>nregistare imediat<61> (min)",
-    "Felv<EFBFBD>tel id<69>tartama",
+    "Felv<EFBFBD>tel id<69>tartama (perc)",
    "Temps de gravaci<63> instant<6E>nia (min)",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)",
    "Trajanje direktnog snimanja (min)",
@@ -4396,7 +4396,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD>)",
    "Minsta h<>ndelse-pause (min)",
    "Durat<EFBFBD> minim<69> emisiuni (min)",
-    "Min. esem<65>ny sz<73>net (min)",
+    "Id<EFBFBD>zit<EFBFBD>sek k<>z<EFBFBD>tti id<69>tartam (perc)",
    "Temps m<>nim en pausa (min)",
    "<EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)",
    "Minimalno vrijeme pauze",
@@ -4418,7 +4418,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD>)",
    "Minsta anv<6E>ndar-inaktivitet (min)",
    "Durata minim<69> de inactivitate (min)",
-    "Min. kezel<65>si aktivit<69>s (min)",
+    "VDR le<6C>ll haszn<7A>lat n<>lk<6C>l (perc)",
    "Temps m<>nim d'inactivitat (min)",
    "<EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)",
    "Minimalno vrijeme neaktivnosti (min)",
@@ -4440,7 +4440,7 @@ const tI18nPhrase Phrases[] = {
    "SVDRP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28>)",
    "SVDRP Timeout (s)",
    "Timeout SVDRP (sec)",
-    "SVDRP Timeout (s)",
+    "SVDRP sz<EFBFBD>tkapcsol haszn<7A>lat n<>lk<6C>l(s)",
    "SVDRP Timeout (s)",
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>. SVDRP (<28><><EFBFBD>)",
    "SVDRP vrijeme neaktivnosti",
@@ -4462,7 +4462,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28>)",
    "Zap timeout(s)",
    "Interval zapping (s)",
-    "",// TODO
+    "Ad<EFBFBD>sv<EFBFBD>lt<EFBFBD>s ideje (s)",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>)",
    "",// hrv TODO
@@ -4484,7 +4484,7 @@ const tI18nPhrase Phrases[] = {
    "",// TODO
    "Kanal vid uppstart",
    "Canalul de pornire",
-    "",// TODO
+    "Ad<EFBFBD>s a bekapcsol<6F>sn<73>l",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",// TODO
@@ -4506,7 +4506,7 @@ const tI18nPhrase Phrases[] = {
    "",// TODO
    "Ljudstyrka vid uppstart",
    "Volumul la pornire",
-    "",// TODO
+    "Hanger<EFBFBD> a bekapcsol<6F>sn<73>l",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",// TODO
@@ -4528,7 +4528,7 @@ const tI18nPhrase Phrases[] = {
    "",// TODO
    "som f<>rut",
    "ca mai <20>nainte",
-    "",// TODO
+    "ahogy az el<65>bb",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",// TODO
@@ -5193,7 +5193,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Info",
    "Info",
-    "",//TODO
+    "Inform<EFBFBD>ci<EFBFBD>",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Info",
@@ -5347,7 +5347,7 @@ const tI18nPhrase Phrases[] = {
    "",// TODO
    "N<EFBFBD>sta",
    "Urm<EFBFBD>tor",
-    "",// TODO
+    "El<EFBFBD>re",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",// TODO
@@ -5369,7 +5369,7 @@ const tI18nPhrase Phrases[] = {
    "",// TODO
    "Bak<EFBFBD>t",
    "Anterior",
-    "",// TODO
+    "Vissza",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",// TODO
@@ -5457,7 +5457,7 @@ const tI18nPhrase Phrases[] = {
    "",// TODO
    "F<EFBFBD>rra kanalen",
    "Canal anterior",
-    "",// TODO
+    "Az el<65>z<EFBFBD> ad<61>s",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",
    "",// TODO
@@ -5545,7 +5545,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Ljud",
    "Sunet",
-    "",// TODO
+    "Hang",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",// TODO
@@ -5986,7 +5986,7 @@ const tI18nPhrase Phrases[] = {
    "",//TODO
    "Inspelningen har startat",
    "A <20>nceput <20>nregistrarea",
-    "",//TODO
+    "A felv<6C>tel elinditva Nd",
    "",//TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "",//TODO
@@ -6030,7 +6030,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> EPG",
    "P<EFBFBD>b<EFBFBD>rjar EPG skanning",
    "Pornesc achizi<7A>ia EPG",
-    "",// TODO
+    "EPG adatok aktualiz<69>l<EFBFBD>sa",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> EPG-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Po<EFBFBD>injem EPG-scan",
@@ -6074,7 +6074,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> VDR",
    "Klassisk VDR",
    "VDR clasic",
-    "",// TODO
+    "Klasszikus VDR",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Klasi<EFBFBD>ni VDR",
@@ -6096,7 +6096,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ST:TNG",
    "ST:TNG konsol",
    "Cons. ST:TNG",
-    "",// TODO
+    "ST:TNG Konzol",
    "",// TODO
    "ST:TNG <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "ST:TNG Konzole",
@@ -6118,7 +6118,7 @@ const tI18nPhrase Phrases[] = {
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",
    "ingen titel",
    "F<EFBFBD>r<EFBFBD> titlu",
-    "",// TODO
+    "n<EFBFBD>v n<>lk<6C>l",
    "",// TODO
    "<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
    "Bez titla",
--- a/4
+++ b/4
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.29 2006/06/24 09:15:17 kls Exp $
+# $Id: newplugin 1.30 2006/09/09 12:38:35 kls Exp $

 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";

@@ -124,7 +124,7 @@ all: libvdr-\$(PLUGIN).so

 libvdr-\$(PLUGIN).so: \$(OBJS)
 	\$(CXX) \$(CXXFLAGS) -shared \$(OBJS) -o \$\@
-	\@cp \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION)
+	\@cp --remove-destination \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION)

 dist: clean
 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
 * See the main source file 'vdr.c' for copyright information and
 * how to reach the author.
 *
- * $Id: recording.c 1.149 2006/07/30 10:23:46 kls Exp $
+ * $Id: recording.c 1.150 2006/09/16 12:12:34 kls Exp $
 */

 #include "recording.h"
@@ -947,7 +947,10 @@ void cRecordings::TouchUpdate(void)

 bool cRecordings::NeedsUpdate(void)
 {
-  return lastUpdate < LastModifiedTime(UpdateFileName());
+  time_t lastModified = LastModifiedTime(UpdateFileName());
+  if (lastModified > time(NULL))
+     return false; // somebody's clock isn't running correctly
+  return lastUpdate < lastModified;
 }

 bool cRecordings::Update(bool Wait)
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
 * See the main source file 'vdr.c' for copyright information and
 * how to reach the author.
 *
- * $Id: timers.c 1.64 2006/09/08 15:06:09 kls Exp $
+ * $Id: timers.c 1.65 2006/09/15 14:15:53 kls Exp $
 */

 #include "timers.h"
@@ -438,13 +438,7 @@ int cTimer::Matches(const cEvent *Event, int *Overlap) const

 bool cTimer::Expired(void) const
 {
-  if (IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL)) {
-     if (HasFlags(tfVps) && event && event->Vps())
-        return event->RunningStatus() == SI::RunningStatusNotRunning;
-     else
-        return true;
-     }
-  return false;
+  return IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL) && (!HasFlags(tfVps) || !event);
 }

 time_t cTimer::StartTime(void) const