The free disk space is now also displayed in the title of the "Recordings" menu

26 files changed, 217 insertions, 176 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d70fb861..71b14b69 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1670,6 +1670,8 @@ Marco Kremer <vdr.hgm.bg@gmx.net>
 Walter Koch <koch@u32.de>
  for adding channels for DVB-T Düsseldorf and Köln (Germany) to channels.cont.terr
  for fixing some missing '-' in the German OSD texts
+ for suggesting to display the free disk space also in the title of the "Recordings"
+ menu
 
 Rolf Groppe <rolf@groppe.de>
  for suggesting to fall back to 'stereo' when switching channels in case the user
diff --git a/HISTORY b/HISTORY
index 655f68d7..fe6e34aa 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5605,3 +5605,5 @@ Video Disk Recorder Revision History
   a patch that was used to implement StopSectionHandler()).
 - Fixed setting the date in the channel display of the classic and sttng skins,
   to avoid unnecessary OSD access (thanks to Marco Schlüßler).
+- The free disk space is now also displayed in the title of the "Recordings"
+  menu (suggested by Walter Koch).
diff --git a/menu.c b/menu.c
index 05aeff0a..9ec407d3 100644
--- 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.472 2008/02/09 12:24:24 kls Exp $
+ * $Id: menu.c 1.473 2008/02/10 11:40:49 kls Exp $
  */
 
 #include "menu.h"
@@ -32,7 +32,7 @@
 
 #define MAXWAIT4EPGINFO   3 // seconds
 #define MODETIMEOUT       3 // seconds
-#define DISKSPACECHEK     5 // seconds between disk space checks in the main menu
+#define DISKSPACECHEK     5 // seconds between disk space checks
 #define NEWTIMERLIMIT   120 // seconds until the start time of a new timer created from the Schedule menu,
                             // within which it will go directly into the "Edit timer" menu to allow
                             // further parameter settings
@@ -47,6 +47,44 @@
 
 #define CHNUMWIDTH  (numdigits(Channels.MaxNumber()) + 1)
 
+// --- cFreeDiskSpace --------------------------------------------------------
+
+#define MB_PER_MINUTE 25.75 // this is just an estimate!
+
+class cFreeDiskSpace {
+private:
+  static time_t lastDiskSpaceCheck;
+  static int lastFreeMB;
+  static cString freeDiskSpaceString;
+public:
+  static bool HasChanged(bool ForceCheck = false);
+  static const char *FreeDiskSpaceString(void) { HasChanged(); return freeDiskSpaceString; }
+  };
+
+time_t cFreeDiskSpace::lastDiskSpaceCheck = 0;
+int cFreeDiskSpace::lastFreeMB = 0;
+cString cFreeDiskSpace::freeDiskSpaceString;
+
+cFreeDiskSpace FreeDiskSpace;
+
+bool cFreeDiskSpace::HasChanged(bool ForceCheck)
+{
+  if (ForceCheck || time(NULL) - lastDiskSpaceCheck > DISKSPACECHEK) {
+     int FreeMB;
+     int Percent = VideoDiskSpace(&FreeMB);
+     lastDiskSpaceCheck = time(NULL);
+     if (ForceCheck || FreeMB != lastFreeMB) {
+        int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
+        int Hours = Minutes / 60;
+        Minutes %= 60;
+        freeDiskSpaceString = cString::sprintf("%s %d%%  -  %2d:%02d %s", tr("Disk"), Percent, Hours, Minutes, tr("free"));
+        lastFreeMB = FreeMB;
+        return true;
+        }
+     }
+  return false;
+}
+
 // --- cMenuEditCaItem -------------------------------------------------------
 
 class cMenuEditCaItem : public cMenuEditIntItem {
@@ -1898,6 +1936,7 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
      SetCurrent(First());
   else if (OpenSubMenus && cReplayControl::LastReplayed() && Open(true))
      return;
+  SetFreeDiskDisplay(true);
   Display();
   SetHelpKeys();
 }
@@ -1908,6 +1947,16 @@ cMenuRecordings::~cMenuRecordings()
   free(base);
 }
 
+bool cMenuRecordings::SetFreeDiskDisplay(bool Force)
+{
+  if (FreeDiskSpace.HasChanged(Force)) {
+     //XXX -> skin function!!!
+     SetTitle(cString::sprintf("%s  -  %s", base ? base : tr("Recordings"), FreeDiskSpace.FreeDiskSpaceString()));
+     return true;
+     }
+  return false;
+}
+
 void cMenuRecordings::SetHelpKeys(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
@@ -1969,6 +2018,7 @@ void cMenuRecordings::Set(bool Refresh)
          }
       }
   free(LastItemText);
+  Refresh |= SetFreeDiskDisplay(Refresh);
   if (Refresh)
      Display();
 }
@@ -2060,6 +2110,7 @@ eOSState cMenuRecordings::Delete(void)
               Recordings.DelByName(ri->FileName());
               cOsdMenu::Del(Current());
               SetHelpKeys();
+              SetFreeDiskDisplay(true);
               Display();
               if (!Count())
                  return osBack;
@@ -2934,8 +2985,6 @@ cOsdObject *cMenuMain::pluginOsdObject = NULL;
 cMenuMain::cMenuMain(eOSState State)
 :cOsdMenu("")
 {
-  lastDiskSpaceCheck = 0;
-  lastFreeMB = 0;
   replaying = false;
   stopReplayItem = NULL;
   cancelEditingItem = NULL;
@@ -3000,26 +3049,15 @@ void cMenuMain::Set(void)
   Display();
 }
 
-#define MB_PER_MINUTE 25.75 // this is just an estimate!
-
 bool cMenuMain::Update(bool Force)
 {
   bool result = false;
 
   // Title with disk usage:
-  if (Force || time(NULL) - lastDiskSpaceCheck > DISKSPACECHEK) {
-     int FreeMB;
-     int Percent = VideoDiskSpace(&FreeMB);
-     if (Force || FreeMB != lastFreeMB) {
-        int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
-        int Hours = Minutes / 60;
-        Minutes %= 60;
-        //XXX -> skin function!!!
-        SetTitle(cString::sprintf("%s  -  %s %d%%  -  %2d:%02d %s", tr("VDR"), tr("Disk"), Percent, Hours, Minutes, tr("free")));
-        lastFreeMB = FreeMB;
-        result = true;
-        }
-     lastDiskSpaceCheck = time(NULL);
+  if (FreeDiskSpace.HasChanged(Force)) {
+     //XXX -> skin function!!!
+     SetTitle(cString::sprintf("%s  -  %s", tr("VDR"), FreeDiskSpace.FreeDiskSpaceString()));
+     result = true;
      }
 
   bool NewReplaying = cControl::Control() != NULL;
diff --git a/menu.h b/menu.h
index 62a3868a..1df1c353 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.89 2007/09/26 14:35:57 kls Exp $
+ * $Id: menu.h 1.90 2008/02/10 11:34:43 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -56,8 +56,6 @@ public:
 
 class cMenuMain : public cOsdMenu {
 private:
-  time_t lastDiskSpaceCheck;
-  int lastFreeMB;
   bool replaying;
   cOsdItem *stopReplayItem;
   cOsdItem *cancelEditingItem;
@@ -156,6 +154,7 @@ private:
   int level;
   int recordingsState;
   int helpKeys;
+  bool SetFreeDiskDisplay(bool Force = false);
   void SetHelpKeys(void);
   void Set(bool Refresh = false);
   bool Open(bool OpenSubMenus = false);
diff --git a/po/ca_ES.po b/po/ca_ES.po
index fa5c8470..c74dc3f7 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\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à <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -215,6 +215,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disc"
+
+msgid "free"
+msgstr "lliure"
+
 msgid "Free To Air"
 msgstr ""
 
@@ -806,12 +812,6 @@ msgstr "Guia de Programació"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disc"
-
-msgid "free"
-msgstr "lliure"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Aturar la reproducció"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index c3ae43cd..9f1f6cbc 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -213,6 +213,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "volno"
+
 msgid "Free To Air"
 msgstr "volný"
 
@@ -804,12 +810,6 @@ msgstr "Program (EPG)"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "volno"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zastavit pøehrávání"
diff --git a/po/da_DK.po b/po/da_DK.po
index e08e7e46..64b1ca54 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -213,6 +213,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "fri"
+
 msgid "Free To Air"
 msgstr "Free To Air"
 
@@ -804,12 +810,6 @@ msgstr "Programoversigt"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "fri"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stop afspilning"
diff --git a/po/de_DE.po b/po/de_DE.po
index 05f139e5..0eb33a0b 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-11-25 15:19+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -213,6 +213,12 @@ msgstr "Benutzer8"
 msgid "Key$User9"
 msgstr "Benutzer9"
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "frei"
+
 msgid "Free To Air"
 msgstr "frei empfangbar"
 
@@ -804,12 +810,6 @@ msgstr "Programm"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "frei"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Wiedergabe beenden"
diff --git a/po/el_GR.po b/po/el_GR.po
index 4595fb1f..e8e48dcc 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -213,6 +213,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Äßóêïò"
+
+msgid "free"
+msgstr "Åëåýèåñïò"
+
 msgid "Free To Air"
 msgstr ""
 
@@ -804,12 +810,6 @@ msgstr "Ðñüãñáììá"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Äßóêïò"
-
-msgid "free"
-msgstr "Åëåýèåñïò"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " ÔÝëïò áíáðáñáãùãÞò"
diff --git a/po/es_ES.po b/po/es_ES.po
index a90a74e0..620eaed9 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\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"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -213,6 +213,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disco"
+
+msgid "free"
+msgstr "libre"
+
 msgid "Free To Air"
 msgstr "en abierto"
 
@@ -804,12 +810,6 @@ msgstr "Guía de Programación"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disco"
-
-msgid "free"
-msgstr "libre"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Parar reprodución"
diff --git a/po/et_EE.po b/po/et_EE.po
index 4d2ad57d..21be591f 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -213,6 +213,12 @@ msgstr "Lisaklahv8"
 msgid "Key$User9"
 msgstr "Lisaklahv9"
 
+msgid "Disk"
+msgstr "Ketas"
+
+msgid "free"
+msgstr "vaba"
+
 msgid "Free To Air"
 msgstr "FTA"
 
@@ -804,12 +810,6 @@ msgstr "Kava"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Ketas"
-
-msgid "free"
-msgstr "vaba"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Lõpetada taasesitamine"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 010c42ad..82d5062b 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -216,6 +216,12 @@ msgstr "Lisänäppäin 8"
 msgid "Key$User9"
 msgstr "Lisänäppäin 9"
 
+msgid "Disk"
+msgstr "Levy"
+
+msgid "free"
+msgstr "vapaana"
+
 msgid "Free To Air"
 msgstr "vapaa"
 
@@ -807,12 +813,6 @@ msgstr "Ohjelmisto"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Levy"
-
-msgid "free"
-msgstr "vapaana"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Lopeta toisto"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 35d35af5..8d8b406a 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-10-18 16:12+0100\n"
 "Last-Translator: Michael Nival <mnival@club-internet.fr>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -219,6 +219,12 @@ msgstr "Utilisateur8"
 msgid "Key$User9"
 msgstr "Utilisateur9"
 
+msgid "Disk"
+msgstr "Disque"
+
+msgid "free"
+msgstr "restant"
+
 msgid "Free To Air"
 msgstr "Aucun cryptage"
 
@@ -810,12 +816,6 @@ msgstr "Programmes"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disque"
-
-msgid "free"
-msgstr "restant"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Arrêter la lecture"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index a7bf2e17..24186b97 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -214,6 +214,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "slobodno"
+
 msgid "Free To Air"
 msgstr ""
 
@@ -805,12 +811,6 @@ msgstr "Raspored"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "slobodno"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Prekini reprodukciju"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index ebd244fe..49327784 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-13 14:21+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -216,6 +216,12 @@ msgstr "Felhasználó8"
 msgid "Key$User9"
 msgstr "Felhasználó9"
 
+msgid "Disk"
+msgstr "Lemez"
+
+msgid "free"
+msgstr "szabad"
+
 msgid "Free To Air"
 msgstr "Kódolatlan"
 
@@ -808,12 +814,6 @@ msgstr "Program"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Lemez"
-
-msgid "free"
-msgstr "szabad"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Lejátszást befejzni"
diff --git a/po/it_IT.po b/po/it_IT.po
index 2f88680b..e9b4ea63 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-10-16 02:15+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -216,6 +216,12 @@ msgstr "Utente8"
 msgid "Key$User9"
 msgstr "Utente9"
 
+msgid "Disk"
+msgstr "Disco"
+
+msgid "free"
+msgstr "liberi"
+
 msgid "Free To Air"
 msgstr "in chiaro"
 
@@ -807,12 +813,6 @@ msgstr "Programmi"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disco"
-
-msgid "free"
-msgstr "liberi"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Ferma riproduzione"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index e945befa..b603904f 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -215,6 +215,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "vrij"
+
 msgid "Free To Air"
 msgstr ""
 
@@ -806,12 +812,6 @@ msgstr "Gids"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "vrij"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stop afspelen"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index bd2238e3..0355f0d7 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -214,6 +214,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "ledig"
+
 msgid "Free To Air"
 msgstr ""
 
@@ -805,12 +811,6 @@ msgstr "Programmer"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "ledig"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stopp avspilling"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index d8be8772..0bed63b5 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -213,6 +213,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Dysk"
+
+msgid "free"
+msgstr "wolnego"
+
 msgid "Free To Air"
 msgstr "nieszyfrowany"
 
@@ -804,12 +810,6 @@ msgstr "Program"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Dysk"
-
-msgid "free"
-msgstr "wolnego"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zatrzymaj odtwarzanie"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 1786077d..3a2915ec 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -213,6 +213,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "livre"
+
 msgid "Free To Air"
 msgstr ""
 
@@ -804,12 +810,6 @@ msgstr "Programação"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "livre"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Parar reprodução"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 72fc8b9b..e468698d 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -214,6 +214,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disc"
+
+msgid "free"
+msgstr "liber"
+
 msgid "Free To Air"
 msgstr "FTA (necriptat)"
 
@@ -805,12 +811,6 @@ msgstr "Program (EPG)"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disc"
-
-msgid "free"
-msgstr "liber"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Opreºte redarea"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 6f6038ed..2f9b40cf 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-11-05 14:24+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -214,6 +214,12 @@ msgstr "¿ÞÛì×ÞÒÐâÕÛì8"
 msgid "Key$User9"
 msgstr "¿ÞÛì×ÞÒÐâÕÛì9"
 
+msgid "Disk"
+msgstr "´ØáÚ"
+
+msgid "free"
+msgstr "áÒÞÑÞÔÝÞ"
+
 msgid "Free To Air"
 msgstr "FTA (ÝÕ×ÐÚÞÔØàÞÒÐÝÞ)"
 
@@ -805,12 +811,6 @@ msgstr "ÂÕÛÕÓØÔ"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "´ØáÚ"
-
-msgid "free"
-msgstr "áÒÞÑÞÔÝÞ"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " ¿àÕÚàÐâØâì ÒÞáßàÞØ×ÒÕÔÕÝØÕ"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 002b82cd..f3f1fe5b 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -214,6 +214,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "prosto"
+
 msgid "Free To Air"
 msgstr "nekodiran"
 
@@ -805,12 +811,6 @@ msgstr "Program"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "prosto"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Prekini predvajanje"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 40d3c252..e994e776 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -214,6 +214,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "ledigt"
+
 msgid "Free To Air"
 msgstr "Okodad"
 
@@ -805,12 +811,6 @@ msgstr "Program"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "ledigt"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Avsluta uppspelning"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 57a73090..2e81d91a 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-24 14:37+0200\n"
 "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -213,6 +213,12 @@ msgstr "Kullanýcý8"
 msgid "Key$User9"
 msgstr "Kullanýcý9"
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "boþ"
+
 msgid "Free To Air"
 msgstr "Þifresiz"
 
@@ -804,12 +810,6 @@ msgstr "Program"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "boþ"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Gösteriþi bitir"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 70afcaf8..fd13c0ed 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.10\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Yarema Aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -213,6 +213,12 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "´ØáÚ"
+
+msgid "free"
+msgstr "ÒöÛìÝÞ"
+
 msgid "Free To Air"
 msgstr "FTA (ÝÕ×ÐÚÞÔÞÒÐÝÞ)"
 
@@ -804,12 +810,6 @@ msgstr "ÂÕÛÕÓöÔ"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "´ØáÚ"
-
-msgid "free"
-msgstr "ÒöÛìÝÞ"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " ·ãßØÝØâØ ßàÞÓàÐÒÐÝÝï"