Added refreshing the recording in the Recording Info/Edit menus

31 files changed, 389 insertions, 251 deletions

diff --git a/menu.c b/menu.c
index 99ca4a66..4d4c1dbf 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 3.7 2013/10/10 12:31:08 kls Exp $
+ * $Id: menu.c 3.8 2013/10/14 09:53:53 kls Exp $
  */
 
 #include "menu.h"
@@ -2134,15 +2134,15 @@ cMenuPathEdit::cMenuPathEdit(const char *Path)
      s = path;
   strn0cpy(name, s, sizeof(name));
   pathIsInUse = Recordings.PathIsInUse(path);
-  if (pathIsInUse) {
-     Add(new cOsdItem(tr("This folder is currently in use - no changes are possible!"), osUnknown, false));
-     Add(new cOsdItem("", osUnknown, false));
-     }
   cOsdItem *p;
   Add(p = folderItem = new cMenuEditStrItem(tr("Folder"), folder, sizeof(folder)));
   p->SetSelectable(!pathIsInUse);
   Add(p = new cMenuEditStrItem(tr("Name"), name, sizeof(name)));
   p->SetSelectable(!pathIsInUse);
+  if (pathIsInUse) {
+     Add(new cOsdItem("", osUnknown, false));
+     Add(new cOsdItem(tr("This folder is currently in use - no changes are possible!"), osUnknown, false));
+     }
   Display();
   if (!pathIsInUse)
      SetHelp(tr("Button$Folder"));
@@ -2207,6 +2207,8 @@ eOSState cMenuPathEdit::ProcessKey(eKeys Key)
 class cMenuRecordingEdit : public cOsdMenu {
 private:
   cRecording *recording;
+  cString originalFileName;
+  int recordingsState;
   char folder[PATH_MAX];
   char name[NAME_MAX];
   int priority;
@@ -2220,6 +2222,7 @@ private:
   int recordingIsInUse;
   void Set(void);
   void SetHelpKeys(void);
+  bool RefreshRecording(void);
   eOSState SetFolder(void);
   eOSState Folder(void);
   eOSState Action(void);
@@ -2235,6 +2238,8 @@ cMenuRecordingEdit::cMenuRecordingEdit(cRecording *Recording)
 {
   SetMenuCategory(mcRecording);
   recording = Recording;
+  originalFileName = recording->FileName();
+  Recordings.StateChanged(recordingsState); // just to get the current state
   strn0cpy(folder, recording->Folder(), sizeof(folder));
   strn0cpy(name, recording->BaseName(), sizeof(name));
   priority = recording->Priority();
@@ -2245,17 +2250,15 @@ cMenuRecordingEdit::cMenuRecordingEdit(cRecording *Recording)
   buttonDeleteMarks = NULL;
   actionCancel = NULL;
   doCut = NULL;
-  recordingIsInUse = recording->IsInUse();
+  recordingIsInUse = ruNone;
   Set();
 }
 
 void cMenuRecordingEdit::Set(void)
 {
+  int current = Current();
   Clear();
-  if (recordingIsInUse) {
-     Add(new cOsdItem(tr("This recording is currently in use - no changes are possible!"), osUnknown, false));
-     Add(new cOsdItem("", osUnknown, false));
-     }
+  recordingIsInUse = recording->IsInUse();
   cOsdItem *p;
   Add(p = folderItem = new cMenuEditStrItem(tr("Folder"), folder, sizeof(folder)));
   p->SetSelectable(!recordingIsInUse);
@@ -2265,6 +2268,11 @@ void cMenuRecordingEdit::Set(void)
   p->SetSelectable(!recordingIsInUse);
   Add(p = new cMenuEditIntItem(tr("Lifetime"), &lifetime, 0, MAXLIFETIME));
   p->SetSelectable(!recordingIsInUse);
+  if (recordingIsInUse) {
+     Add(new cOsdItem("", osUnknown, false));
+     Add(new cOsdItem(tr("This recording is currently in use - no changes are possible!"), osUnknown, false));
+     }
+  SetCurrent(Get(current));
   Display();
   SetHelpKeys();
 }
@@ -2277,11 +2285,11 @@ void cMenuRecordingEdit::SetHelpKeys(void)
   actionCancel = NULL;
   doCut = NULL;
   if ((recordingIsInUse & ruCut) != 0)
-     buttonAction = actionCancel = ((recordingIsInUse & ruPending) != 0) ? tr("Button$Stop cutting") : tr("Button$Cancel cutting");
+     buttonAction = actionCancel = ((recordingIsInUse & ruPending) != 0) ? tr("Button$Cancel cutting") : tr("Button$Stop cutting");
   else if ((recordingIsInUse & ruMove) != 0)
-     buttonAction = actionCancel = ((recordingIsInUse & ruPending) != 0) ? tr("Button$Stop moving") : tr("Button$Cancel moving");
+     buttonAction = actionCancel = ((recordingIsInUse & ruPending) != 0) ? tr("Button$Cancel moving") : tr("Button$Stop moving");
   else if ((recordingIsInUse & ruCopy) != 0)
-     buttonAction = actionCancel = ((recordingIsInUse & ruPending) != 0) ? tr("Button$Stop copying") : tr("Button$Cancel copying");
+     buttonAction = actionCancel = ((recordingIsInUse & ruPending) != 0) ? tr("Button$Cancel copying") : tr("Button$Stop copying");
   else if (recording->HasMarks()) {
      buttonAction = doCut = tr("Button$Cut");
      buttonDeleteMarks = tr("Button$Delete marks");
@@ -2289,6 +2297,19 @@ void cMenuRecordingEdit::SetHelpKeys(void)
   SetHelp(buttonFolder, buttonAction, buttonDeleteMarks);
 }
 
+bool cMenuRecordingEdit::RefreshRecording(void)
+{
+  if (Recordings.StateChanged(recordingsState)) {
+     if ((recording = Recordings.GetByName(originalFileName)) != NULL)
+        Set();
+     else {
+        Skins.Message(mtWarning, tr("Recording vanished!"));
+        return false;
+        }
+     }
+  return true;
+}
+
 eOSState cMenuRecordingEdit::SetFolder(void)
 {
   if (cMenuFolder *mf = dynamic_cast<cMenuFolder *>(SubMenu())) {
@@ -2313,6 +2334,7 @@ eOSState cMenuRecordingEdit::Action(void)
         Skins.Message(mtError, tr("Error while queueing recording for cutting!"));
      }
   recordingIsInUse = recording->IsInUse();
+  RefreshRecording();
   SetHelpKeys();
   return osContinue;
 }
@@ -2358,6 +2380,10 @@ eOSState cMenuRecordingEdit::ApplyChanges(void)
 
 eOSState cMenuRecordingEdit::ProcessKey(eKeys Key)
 {
+  if (!HasSubMenu()) {
+     if (!RefreshRecording())
+        return osBack; // the recording has vanished, so close this menu
+     }
   eOSState state = cOsdMenu::ProcessKey(Key);
   if (state == osUnknown) {
      if (!recordingIsInUse) {
@@ -2382,7 +2408,10 @@ eOSState cMenuRecordingEdit::ProcessKey(eKeys Key)
 class cMenuRecording : public cOsdMenu {
 private:
   cRecording *recording;
+  cString originalFileName;
+  int recordingsState;
   bool withButtons;
+  bool RefreshRecording(void);
 public:
   cMenuRecording(cRecording *Recording, bool WithButtons = false);
   virtual void Display(void);
@@ -2394,13 +2423,32 @@ cMenuRecording::cMenuRecording(cRecording *Recording, bool WithButtons)
 {
   SetMenuCategory(mcRecordingInfo);
   recording = Recording;
+  originalFileName = recording->FileName();
+  Recordings.StateChanged(recordingsState); // just to get the current state
   withButtons = WithButtons;
   if (withButtons)
      SetHelp(tr("Button$Play"), tr("Button$Rewind"), NULL, tr("Button$Edit"));
 }
 
+bool cMenuRecording::RefreshRecording(void)
+{
+  if (Recordings.StateChanged(recordingsState)) {
+     if ((recording = Recordings.GetByName(originalFileName)) != NULL)
+        Display();
+     else {
+        Skins.Message(mtWarning, tr("Recording vanished!"));
+        return false;
+        }
+     }
+  return true;
+}
+
 void cMenuRecording::Display(void)
 {
+  if (HasSubMenu()) {
+     SubMenu()->Display();
+     return;
+     }
   cOsdMenu::Display();
   DisplayMenu()->SetRecording(recording);
   if (recording->Info()->Description())
@@ -2415,6 +2463,8 @@ eOSState cMenuRecording::ProcessKey(eKeys Key)
         CloseSubMenu();
      return state;
      }
+  else if (!RefreshRecording())
+     return osBack; // the recording has vanished, so close this menu
   switch (int(Key)) {
     case kUp|k_Repeat:
     case kUp:
diff --git a/po/ar.po b/po/ar.po
index 224bbe98..9937682b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -730,10 +730,10 @@ msgstr "الكامة لا تستجيب"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -749,30 +749,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index a1808cf8..911ce230 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -729,10 +729,10 @@ msgstr "CAM no respon"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -748,30 +748,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 899559aa..3e4855b5 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -729,10 +729,10 @@ msgstr "CAM neodpovídá!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -748,30 +748,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index a9bb5dea..130fc1a3 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -726,10 +726,10 @@ msgstr "CAM svarer ikke!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -745,30 +745,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 54ec37e7..d31088b3 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -726,12 +726,12 @@ msgstr "CAM antwortet nicht!"
 msgid "Edit path"
 msgstr "Pfad editieren"
 
-msgid "This folder is currently in use - no changes are possible!"
-msgstr "Dieser Ordner ist zur Zeit in Verwendung - es sind keine �nderungen m�glich!"
-
 msgid "Folder"
 msgstr "Ordner"
 
+msgid "This folder is currently in use - no changes are possible!"
+msgstr "Dieser Ordner ist zur Zeit in Verwendung - es sind keine �nderungen m�glich!"
+
 #, c-format
 msgid "Move entire folder containing %d recordings?"
 msgstr "Ganzen Ordner mit %d Aufnahmen verschieben?"
@@ -745,30 +745,33 @@ msgstr "Aufnahme editieren"
 msgid "This recording is currently in use - no changes are possible!"
 msgstr "Diese Aufnahme ist zur Zeit in Verwendung - es sind keine �nderungen m�glich!"
 
-msgid "Button$Stop cutting"
-msgstr "Schnitt beenden"
-
 msgid "Button$Cancel cutting"
 msgstr "Schnitt abbrechen"
 
-msgid "Button$Stop moving"
-msgstr "Verschieben beenden"
+msgid "Button$Stop cutting"
+msgstr "Schnitt beenden"
 
 msgid "Button$Cancel moving"
 msgstr "Verschieben abbrechen"
 
-msgid "Button$Stop copying"
-msgstr "Kopieren beenden"
+msgid "Button$Stop moving"
+msgstr "Verschieben beenden"
 
 msgid "Button$Cancel copying"
 msgstr "Kopieren abbrechen"
 
+msgid "Button$Stop copying"
+msgstr "Kopieren beenden"
+
 msgid "Button$Cut"
 msgstr "Schneiden"
 
 msgid "Button$Delete marks"
 msgstr "Marken l�schen"
 
+msgid "Recording vanished!"
+msgstr "Aufnahme verschwunden!"
+
 msgid "Error while queueing recording for cutting!"
 msgstr "Fehler beim Hinzuf�gen der Aufnahme zur Schnittwarteschlange"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 37486a2f..f03e2a35 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -726,10 +726,10 @@ msgstr ""
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -745,30 +745,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 9b87401c..ec6d781f 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -727,10 +727,10 @@ msgstr "�CAM no responde!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -746,30 +746,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 94b65fc1..8b7c9131 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -726,10 +726,10 @@ msgstr "CAM ei vasta"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -745,30 +745,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index c159accb..151589d5 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -730,10 +730,10 @@ msgstr "CA-moduuli ei vastaa!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -749,30 +749,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index b7b4f40b..a6e0e9a2 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-02-24 12:56+0100\n"
 "Last-Translator: Dominique Plu <dplu@free.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -736,10 +736,10 @@ msgstr "Pas de réponse du CAM"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -755,30 +755,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 09298ee8..23f79a1c 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -728,10 +728,10 @@ msgstr "CAM ne odgovara!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -747,30 +747,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index c341ce0a..1b4ac529 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-01 19:22+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -730,10 +730,10 @@ msgstr "A CAM nem válaszol!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -749,30 +749,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index d01cb6e1..cc5a5678 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-09-18 23:57+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -733,10 +733,10 @@ msgstr "La CAM non risponde!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -752,30 +752,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index a6fb50e1..05eb65cf 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -726,10 +726,10 @@ msgstr "Dekodavimo modulis (CAM) neveikia!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -745,30 +745,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index d4600fbb..0bceb1b5 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2012-11-19 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -727,10 +727,10 @@ msgstr "CAM не одговара!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -746,30 +746,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 56ff33b3..6b2d1226 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Cedric Dewijs <cedric.dewijs@telfort.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -731,10 +731,10 @@ msgstr "CAM reageert niet!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -750,30 +750,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 29f1486b..b338ba7d 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -727,10 +727,10 @@ msgstr ""
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -746,30 +746,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 9ad56a3b..28ba68eb 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -728,10 +728,10 @@ msgstr "CAM nie reaguje!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -747,30 +747,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 62b8a9fa..9f04d875 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -727,10 +727,10 @@ msgstr "A CAM n�o responde!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -746,30 +746,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index b4e5c284..f250a41c 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-02-09 23:01+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sorceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -728,10 +728,10 @@ msgstr "CAM-ul nu reacţionează!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -747,30 +747,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 42a7b007..3b4339fd 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-10 17:13+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -727,10 +727,10 @@ msgstr "CAM �� ��������"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -746,30 +746,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 208c2419..bd7fe2bc 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-04 21:24+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -726,10 +726,10 @@ msgstr "CAM neodpoved�!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -745,30 +745,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 0d40510f..99f2ec11 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -727,10 +727,10 @@ msgstr "CAM se ne odziva!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -746,30 +746,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index 36c9dbba..fe5f3cb4 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -727,10 +727,10 @@ msgstr "CAM ne reaguje!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -746,30 +746,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index cee61560..05f6a3b7 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-02-18 17:04+0100\n"
 "Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -730,10 +730,10 @@ msgstr "CAM svarar inte!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -749,30 +749,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index d672db68..5c9f44e5 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -726,10 +726,10 @@ msgstr "CAM yan�t vermiyor!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -745,30 +745,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 80087568..a09fcc71 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-02-09 16:00+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -727,10 +727,10 @@ msgstr "CAM не відповідає!"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -746,30 +746,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0d7c9755..9746e83a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-10 14:32+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -728,10 +728,10 @@ msgstr "CAM 没有响应！"
 msgid "Edit path"
 msgstr ""
 
-msgid "This folder is currently in use - no changes are possible!"
+msgid "Folder"
 msgstr ""
 
-msgid "Folder"
+msgid "This folder is currently in use - no changes are possible!"
 msgstr ""
 
 #, c-format
@@ -747,30 +747,33 @@ msgstr ""
 msgid "This recording is currently in use - no changes are possible!"
 msgstr ""
 
-msgid "Button$Stop cutting"
-msgstr ""
-
 msgid "Button$Cancel cutting"
 msgstr ""
 
-msgid "Button$Stop moving"
+msgid "Button$Stop cutting"
 msgstr ""
 
 msgid "Button$Cancel moving"
 msgstr ""
 
-msgid "Button$Stop copying"
+msgid "Button$Stop moving"
 msgstr ""
 
 msgid "Button$Cancel copying"
 msgstr ""
 
+msgid "Button$Stop copying"
+msgstr ""
+
 msgid "Button$Cut"
 msgstr ""
 
 msgid "Button$Delete marks"
 msgstr ""
 
+msgid "Recording vanished!"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
diff --git a/recording.c b/recording.c
index 90910108..30cf0387 100644
--- 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 3.5 2013/10/12 13:48:32 kls Exp $
+ * $Id: recording.c 3.6 2013/10/14 09:40:00 kls Exp $
  */
 
 #include "recording.h"
@@ -1834,16 +1834,16 @@ bool cRecordingsHandlerEntry::Active(bool &Error)
         copier->Start();
         }
      ClearPending();
+     Recordings.ChangeState();
      return true;
      }
-  else {
-     if (CopierFinishedOk && (Usage() & ruMove) != 0) {
-        cRecording Recording(FileNameSrc());
-        Recording.Delete();
-        Recordings.ChangeState();
-        Recordings.TouchUpdate();
-        }
+  // Clean up:
+  if (CopierFinishedOk && (Usage() & ruMove) != 0) {
+     cRecording Recording(FileNameSrc());
+     Recording.Delete();
      }
+  Recordings.ChangeState();
+  Recordings.TouchUpdate();
   return false;
 }
 
@@ -1887,6 +1887,7 @@ bool cRecordingsHandler::Add(int Usage, const char *FileNameSrc, const char *Fil
               operations.Add(new cRecordingsHandlerEntry(Usage, FileNameSrc, FileNameDst));
               finished = false;
               Active(); // start it right away if possible
+              Recordings.ChangeState();
               return true;
               }
            else
@@ -1906,14 +1907,17 @@ bool cRecordingsHandler::Add(int Usage, const char *FileNameSrc, const char *Fil
 void cRecordingsHandler::Del(const char *FileName)
 {
   cMutexLock MutexLock(&mutex);
-  if (cRecordingsHandlerEntry *r = Get(FileName))
+  if (cRecordingsHandlerEntry *r = Get(FileName)) {
      operations.Del(r);
+     Recordings.ChangeState();
+     }
 }
 
 void cRecordingsHandler::DelAll(void)
 {
   cMutexLock MutexLock(&mutex);
   operations.Clear();
+  Recordings.ChangeState();
 }
 
 int cRecordingsHandler::GetUsage(const char *FileName)
diff --git a/svdrp.c b/svdrp.c
index 1d2593a2..7f91479f 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 3.2 2013/10/10 12:18:12 kls Exp $
+ * $Id: svdrp.c 3.3 2013/10/14 09:49:38 kls Exp $
  */
 
 #include "svdrp.h"
@@ -1570,7 +1570,7 @@ void cSVDRP::CmdRENR(const char *Option)
                  option = skipspace(++option);
               if (*option) {
                  cString oldName = recording->Name();
-                 if (recording->ChangeName(option))
+                 if ((recording = Recordings.GetByName(recording->FileName())) != NULL && recording->ChangeName(option))
                     Reply(250, "Recording \"%s\" renamed to \"%s\"", *oldName, recording->Name());
                  else
                     Reply(554, "Error while renaming recording \"%s\" to \"%s\"!", *oldName, option);