summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY6
-rw-r--r--UPDATE-2.0.04
-rw-r--r--menu.c155
-rw-r--r--menu.h3
-rw-r--r--osdbase.c13
-rw-r--r--osdbase.h3
-rw-r--r--po/ar.po8
-rw-r--r--po/ca_ES.po8
-rw-r--r--po/cs_CZ.po8
-rw-r--r--po/da_DK.po8
-rw-r--r--po/de_DE.po8
-rw-r--r--po/el_GR.po8
-rw-r--r--po/es_ES.po8
-rw-r--r--po/et_EE.po8
-rw-r--r--po/fi_FI.po8
-rw-r--r--po/fr_FR.po8
-rw-r--r--po/hr_HR.po8
-rw-r--r--po/hu_HU.po8
-rw-r--r--po/it_IT.po8
-rw-r--r--po/lt_LT.po8
-rw-r--r--po/mk_MK.po8
-rw-r--r--po/nl_NL.po8
-rw-r--r--po/nn_NO.po8
-rw-r--r--po/pl_PL.po8
-rw-r--r--po/pt_PT.po8
-rw-r--r--po/ro_RO.po8
-rw-r--r--po/ru_RU.po8
-rw-r--r--po/sk_SK.po8
-rw-r--r--po/sl_SI.po8
-rw-r--r--po/sr_SR.po8
-rw-r--r--po/sv_SE.po8
-rw-r--r--po/tr_TR.po8
-rw-r--r--po/uk_UA.po8
-rw-r--r--po/zh_CN.po8
-rw-r--r--skins.h47
-rw-r--r--timers.c10
-rw-r--r--timers.h6
37 files changed, 259 insertions, 212 deletions
diff --git a/HISTORY b/HISTORY
index c8dc570c..51d0681a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7339,7 +7339,7 @@ Video Disk Recorder Revision History
- Modified editing marks are now written to disk whenever the replay progress display
gets hidden (thanks to Christoph Haubrich).
-2012-12-06: Version 1.7.33
+2012-12-08: Version 1.7.33
- In order to be able to play TS recordings from other sources, in which there is
more than one PMT PID in the PAT, 'int cPatPmtParser::PatPmt(void)' has been changed
@@ -7412,3 +7412,7 @@ Video Disk Recorder Revision History
export LC_NUMERIC=C
before running VDR. Otherwise your plugin's configuration data may not be read or
written correctly.
+- The new functions SetItemEvent(), SetItemTimer(), SetItemChannel() and
+ SetItemRecording() of the cSkinDisplayMenu class can be reimplemented by skin
+ plugins to display these items in a more elaborate way than just a simple line of
+ text.
diff --git a/UPDATE-2.0.0 b/UPDATE-2.0.0
index f069aef7..c092167b 100644
--- a/UPDATE-2.0.0
+++ b/UPDATE-2.0.0
@@ -111,6 +111,10 @@ Skins:
"LCARS" is the new default skin of VDR. It requires at least a 4bpp (16 color) full
screen OSD, but you can still operate it if your OSD can handle only fewer colors
(in which case you may want to switch to the "ST:TNG" or "Classic VDR" skin).
+- The new functions SetItemEvent(), SetItemTimer(), SetItemChannel() and
+ SetItemRecording() of the cSkinDisplayMenu class can be reimplemented by skin
+ plugins to display these items in a more elaborate way than just a simple line of
+ text.
Remote control:
diff --git a/menu.c b/menu.c
index 8c23b264..e2d34ed4 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 2.70 2012/12/06 11:08:56 kls Exp $
+ * $Id: menu.c 2.71 2012/12/07 13:48:15 kls Exp $
*/
#include "menu.h"
@@ -284,6 +284,7 @@ public:
virtual int Compare(const cListObject &ListObject) const;
virtual void Set(void);
cChannel *Channel(void) { return channel; }
+ virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
};
cMenuChannelItem::eChannelSortMode cMenuChannelItem::sortMode = csmNumber;
@@ -323,6 +324,12 @@ void cMenuChannelItem::Set(void)
SetText(buffer);
}
+void cMenuChannelItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+ if (!DisplayMenu->SetItemChannel(channel, Index, Current, Selectable, sortMode == csmProvider))
+ DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+}
+
// --- cMenuChannels ---------------------------------------------------------
#define CHANNELNUMBERTIMEOUT 1000 //ms
@@ -1001,6 +1008,7 @@ public:
virtual int Compare(const cListObject &ListObject) const;
virtual void Set(void);
cTimer *Timer(void) { return timer; }
+ virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
};
cMenuTimerItem::cMenuTimerItem(cTimer *Timer)
@@ -1049,6 +1057,12 @@ void cMenuTimerItem::Set(void)
File));
}
+void cMenuTimerItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+ if (!DisplayMenu->SetItemTimer(timer, Index, Current, Selectable))
+ DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+}
+
// --- cMenuTimers -----------------------------------------------------------
class cMenuTimers : public cOsdMenu {
@@ -1215,7 +1229,7 @@ cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch, bool Buttons)
cChannel *channel = Channels.GetByChannelID(event->ChannelID(), true);
if (channel) {
SetTitle(channel->Name());
- int TimerMatch = tmNone;
+ eTimerMatch TimerMatch = tmNone;
Timers.GetMatch(event, &TimerMatch);
if (Buttons)
SetHelp(TimerMatch == tmFull ? tr("Button$Timer") : tr("Button$Record"), NULL, NULL, CanSwitch ? tr("Button$Switch") : NULL);
@@ -1273,13 +1287,14 @@ public:
const cEvent *event;
const cChannel *channel;
bool withDate;
- int timerMatch;
+ eTimerMatch timerMatch;
cMenuScheduleItem(const cEvent *Event, cChannel *Channel = NULL, bool WithDate = false);
static void SetSortMode(eScheduleSortMode SortMode) { sortMode = SortMode; }
static void IncSortMode(void) { sortMode = eScheduleSortMode((sortMode == ssmAllAll) ? ssmAllThis : sortMode + 1); }
static eScheduleSortMode SortMode(void) { return sortMode; }
virtual int Compare(const cListObject &ListObject) const;
bool Update(bool Force = false);
+ virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
};
cMenuScheduleItem::eScheduleSortMode cMenuScheduleItem::sortMode = ssmAllThis;
@@ -1309,7 +1324,7 @@ static const char *TimerMatchChars = " tT";
bool cMenuScheduleItem::Update(bool Force)
{
bool result = false;
- int OldTimerMatch = timerMatch;
+ eTimerMatch OldTimerMatch = timerMatch;
Timers.GetMatch(event, &timerMatch);
if (Force || timerMatch != OldTimerMatch) {
cString buffer;
@@ -1330,6 +1345,12 @@ bool cMenuScheduleItem::Update(bool Force)
return result;
}
+void cMenuScheduleItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+ if (!DisplayMenu->SetItemEvent(event, Index, Current, Selectable, channel, withDate, timerMatch))
+ DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+}
+
// --- cMenuWhatsOn ----------------------------------------------------------
class cMenuWhatsOn : public cOsdMenu {
@@ -1430,7 +1451,7 @@ eOSState cMenuWhatsOn::Record(void)
cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
if (item) {
if (item->timerMatch == tmFull) {
- int tm = tmNone;
+ eTimerMatch tm = tmNone;
cTimer *timer = Timers.GetMatch(item->event, &tm);
if (timer)
return AddSubMenu(new cMenuEditTimer(timer));
@@ -1676,7 +1697,7 @@ eOSState cMenuSchedule::Record(void)
cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
if (item) {
if (item->timerMatch == tmFull) {
- int tm = tmNone;
+ eTimerMatch tm = tmNone;
cTimer *timer = Timers.GetMatch(item->event, &tm);
if (timer)
return AddSubMenu(new cMenuEditTimer(timer));
@@ -2153,7 +2174,8 @@ eOSState cMenuRecording::ProcessKey(eKeys Key)
class cMenuRecordingItem : public cOsdItem {
private:
- char *fileName;
+ cRecording *recording;
+ int level;
char *name;
int totalEntries, newEntries;
public:
@@ -2161,13 +2183,15 @@ public:
~cMenuRecordingItem();
void IncrementCounter(bool New);
const char *Name(void) { return name; }
- const char *FileName(void) { return fileName; }
+ cRecording *Recording(void) { return recording; }
bool IsDirectory(void) { return name != NULL; }
+ virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
};
cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording, int Level)
{
- fileName = strdup(Recording->FileName());
+ recording = Recording;
+ level = Level;
name = NULL;
totalEntries = newEntries = 0;
SetText(Recording->Title('\t', true, Level));
@@ -2177,7 +2201,6 @@ cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording, int Level)
cMenuRecordingItem::~cMenuRecordingItem()
{
- free(fileName);
free(name);
}
@@ -2189,6 +2212,12 @@ void cMenuRecordingItem::IncrementCounter(bool New)
SetText(cString::sprintf("%d\t\t%d\t%s", totalEntries, newEntries, name));
}
+void cMenuRecordingItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+ if (!DisplayMenu->SetItemRecording(recording, Index, Current, Selectable, level, totalEntries, newEntries))
+ DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+}
+
// --- cMenuRecordings -------------------------------------------------------
cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
@@ -2224,8 +2253,7 @@ void cMenuRecordings::SetHelpKeys(void)
NewHelpKeys = 1;
else {
NewHelpKeys = 2;
- cRecording *recording = GetRecording(ri);
- if (recording && recording->Info()->Title())
+ if (ri->Recording()->Info()->Title())
NewHelpKeys = 3;
}
}
@@ -2248,12 +2276,8 @@ void cMenuRecordings::Set(bool Refresh)
char *LastItemText = NULL;
cThreadLock RecordingsLock(&Recordings);
if (Refresh) {
- cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
- if (ri) {
- cRecording *Recording = Recordings.GetByName(ri->FileName());
- if (Recording)
- CurrentRecording = Recording->FileName();
- }
+ if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()))
+ CurrentRecording = ri->Recording()->FileName();
}
Clear();
GetRecordingsSortMode(DirectoryName());
@@ -2293,14 +2317,6 @@ cString cMenuRecordings::DirectoryName(void)
return d;
}
-cRecording *cMenuRecordings::GetRecording(cMenuRecordingItem *Item)
-{
- cRecording *recording = Recordings.GetByName(Item->FileName());
- if (!recording)
- Skins.Message(mtError, tr("Error while accessing recording!"));
- return recording;
-}
-
bool cMenuRecordings::Open(bool OpenSubMenus)
{
cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
@@ -2324,11 +2340,8 @@ eOSState cMenuRecordings::Play(void)
if (ri->IsDirectory())
Open();
else {
- cRecording *recording = GetRecording(ri);
- if (recording) {
- cReplayControl::SetRecording(recording->FileName());
- return osReplay;
- }
+ cReplayControl::SetRecording(ri->Recording()->FileName());
+ return osReplay;
}
}
return osContinue;
@@ -2340,13 +2353,10 @@ eOSState cMenuRecordings::Rewind(void)
return osContinue;
cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
if (ri && !ri->IsDirectory()) {
- cRecording *recording = GetRecording(ri);
- if (recording) {
- cDevice::PrimaryDevice()->StopReplay(); // must do this first to be able to rewind the currently replayed recording
- cResumeFile ResumeFile(ri->FileName(), recording->IsPesRecording());
- ResumeFile.Delete();
- return Play();
- }
+ cDevice::PrimaryDevice()->StopReplay(); // must do this first to be able to rewind the currently replayed recording
+ cResumeFile ResumeFile(ri->Recording()->FileName(), ri->Recording()->IsPesRecording());
+ ResumeFile.Delete();
+ return Play();
}
return osContinue;
}
@@ -2358,7 +2368,7 @@ eOSState cMenuRecordings::Delete(void)
cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
if (ri && !ri->IsDirectory()) {
if (Interface->Confirm(tr("Delete recording?"))) {
- cRecordControl *rc = cRecordControls::GetRecordControl(ri->FileName());
+ cRecordControl *rc = cRecordControls::GetRecordControl(ri->Recording()->FileName());
if (rc) {
if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
cTimer *timer = rc->Timer();
@@ -2375,33 +2385,32 @@ eOSState cMenuRecordings::Delete(void)
else
return osContinue;
}
- cRecording *recording = GetRecording(ri);
- if (recording) {
- if (cCutter::Active(ri->FileName())) {
- if (Interface->Confirm(tr("Recording is being edited - really delete?"))) {
- cCutter::Stop();
- recording = Recordings.GetByName(ri->FileName()); // cCutter::Stop() might have deleted it if it was the edited version
- // we continue with the code below even if recording is NULL,
- // in order to have the menu updated etc.
- }
- else
- return osContinue;
- }
- if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), ri->FileName()) == 0)
- cControl::Shutdown();
- if (!recording || recording->Delete()) {
- cReplayControl::ClearLastReplayed(ri->FileName());
- Recordings.DelByName(ri->FileName());
- cOsdMenu::Del(Current());
- SetHelpKeys();
- cVideoDiskUsage::ForceCheck();
- Display();
- if (!Count())
- return osBack;
+ cRecording *recording = ri->Recording();
+ cString FileName = recording->FileName();
+ if (cCutter::Active(ri->Recording()->FileName())) {
+ if (Interface->Confirm(tr("Recording is being edited - really delete?"))) {
+ cCutter::Stop();
+ recording = Recordings.GetByName(FileName); // cCutter::Stop() might have deleted it if it was the edited version
+ // we continue with the code below even if recording is NULL,
+ // in order to have the menu updated etc.
}
else
- Skins.Message(mtError, tr("Error while deleting recording!"));
+ return osContinue;
}
+ if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), FileName) == 0)
+ cControl::Shutdown();
+ if (!recording || recording->Delete()) {
+ cReplayControl::ClearLastReplayed(FileName);
+ Recordings.DelByName(FileName);
+ cOsdMenu::Del(Current());
+ SetHelpKeys();
+ cVideoDiskUsage::ForceCheck();
+ Display();
+ if (!Count())
+ return osBack;
+ }
+ else
+ Skins.Message(mtError, tr("Error while deleting recording!"));
}
}
return osContinue;
@@ -2412,11 +2421,8 @@ eOSState cMenuRecordings::Info(void)
if (HasSubMenu() || Count() == 0)
return osContinue;
cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
- if (ri && !ri->IsDirectory()) {
- cRecording *recording = GetRecording(ri);
- if (recording && recording->Info()->Title())
- return AddSubMenu(new cMenuRecording(recording, true));
- }
+ if (ri && !ri->IsDirectory() && ri->Recording()->Info()->Title())
+ return AddSubMenu(new cMenuRecording(ri->Recording(), true));
return osContinue;
}
@@ -2426,14 +2432,11 @@ eOSState cMenuRecordings::Commands(eKeys Key)
return osContinue;
cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
if (ri && !ri->IsDirectory()) {
- cRecording *recording = GetRecording(ri);
- if (recording) {
- cMenuCommands *menu;
- eOSState state = AddSubMenu(menu = new cMenuCommands(tr("Recording commands"), &RecordingCommands, cString::sprintf("\"%s\"", *strescape(recording->FileName(), "\\\"$"))));
- if (Key != kNone)
- state = menu->ProcessKey(Key);
- return state;
- }
+ cMenuCommands *menu;
+ eOSState state = AddSubMenu(menu = new cMenuCommands(tr("Recording commands"), &RecordingCommands, cString::sprintf("\"%s\"", *strescape(ri->Recording()->FileName(), "\\\"$"))));
+ if (Key != kNone)
+ state = menu->ProcessKey(Key);
+ return state;
}
return osContinue;
}
diff --git a/menu.h b/menu.h
index 10ffc7ab..196c0385 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 2.12 2012/09/07 08:48:34 kls Exp $
+ * $Id: menu.h 2.13 2012/12/07 13:44:13 kls Exp $
*/
#ifndef __MENU_H
@@ -208,7 +208,6 @@ private:
eOSState Commands(eKeys Key = kNone);
protected:
cString DirectoryName(void);
- cRecording *GetRecording(cMenuRecordingItem *Item);
public:
cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
~cMenuRecordings();
diff --git a/osdbase.c b/osdbase.c
index 37437308..fafa9c77 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osdbase.c 2.6 2012/04/23 09:41:22 kls Exp $
+ * $Id: osdbase.c 2.7 2012/12/07 09:50:47 kls Exp $
*/
#include "osdbase.h"
@@ -55,6 +55,11 @@ void cOsdItem::SetFresh(bool Fresh)
fresh = Fresh;
}
+void cOsdItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+ DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+}
+
eOSState cOsdItem::ProcessKey(eKeys Key)
{
return Key == kOk ? state : osUnknown;
@@ -246,7 +251,7 @@ void cOsdMenu::Display(void)
int n = 0;
for (cOsdItem *item = Get(first); item; item = Next(item)) {
bool CurrentSelectable = (i == current) && item->Selectable();
- displayMenu->SetItem(item->Text(), i - first, CurrentSelectable, item->Selectable());
+ item->SetMenuItem(displayMenu, i - first, CurrentSelectable, item->Selectable());
if (CurrentSelectable)
cStatus::MsgOsdCurrentItem(item->Text());
if (++n == displayMenuItems)
@@ -275,7 +280,7 @@ void cOsdMenu::DisplayCurrent(bool Current)
{
cOsdItem *item = Get(current);
if (item) {
- displayMenu->SetItem(item->Text(), current - first, Current && item->Selectable(), item->Selectable());
+ item->SetMenuItem(displayMenu, current - first, Current && item->Selectable(), item->Selectable());
if (Current && item->Selectable())
cStatus::MsgOsdCurrentItem(item->Text());
if (!Current)
@@ -296,7 +301,7 @@ void cOsdMenu::DisplayItem(cOsdItem *Item)
int Offset = Index - first;
if (Offset >= 0 && Offset < first + displayMenuItems) {
bool Current = Index == current;
- displayMenu->SetItem(Item->Text(), Offset, Current && Item->Selectable(), Item->Selectable());
+ Item->SetMenuItem(displayMenu, Offset, Current && Item->Selectable(), Item->Selectable());
if (Current && Item->Selectable())
cStatus::MsgOsdCurrentItem(Item->Text());
}
diff --git a/osdbase.h b/osdbase.h
index a2e9914a..46351841 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osdbase.h 2.4 2012/04/23 09:40:07 kls Exp $
+ * $Id: osdbase.h 2.5 2012/12/07 09:49:35 kls Exp $
*/
#ifndef __OSDBASE_H
@@ -63,6 +63,7 @@ public:
void SetFresh(bool Fresh);
const char *Text(void) const { return text; }
virtual void Set(void) {}
+ virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
virtual eOSState ProcessKey(eKeys Key);
};
diff --git a/po/ar.po b/po/ar.po
index b6b47ed2..43b1c659 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\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"
@@ -753,9 +753,6 @@ msgstr "افتح"
msgid "Commands"
msgstr "الاوامر"
-msgid "Error while accessing recording!"
-msgstr "حدث خطاء عند محاولة الوصول لتسجيلات"
-
msgid "Delete recording?"
msgstr "حذف التسجيل"
@@ -1421,3 +1418,6 @@ msgstr "القرص الصلب"
msgid "free"
msgstr "مساحة حرة"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "حدث خطاء عند محاولة الوصول لتسجيلات"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 0ffbae77..ea4dc9d6 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\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"
@@ -744,9 +744,6 @@ msgstr "Obrir"
msgid "Commands"
msgstr "Ordres"
-msgid "Error while accessing recording!"
-msgstr "Error a l'accedir a la gravaci!"
-
msgid "Delete recording?"
msgstr "Esborrar gravaci?"
@@ -1395,3 +1392,6 @@ msgstr "Disc"
msgid "free"
msgstr "lliure"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Error a l'accedir a la gravaci!"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 3230371e..2facfbdd 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.14\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2010-05-06 11:00+0200\n"
"Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
"Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -743,9 +743,6 @@ msgstr "Otevřít"
msgid "Commands"
msgstr "Příkazy"
-msgid "Error while accessing recording!"
-msgstr "Chyba při přístupu k nahrávkám!"
-
msgid "Delete recording?"
msgstr "Smazat nahrávku?"
@@ -1394,3 +1391,6 @@ msgstr "Disk"
msgid "free"
msgstr "volno"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Chyba při přístupu k nahrávkám!"
diff --git a/po/da_DK.po b/po/da_DK.po
index e0b7bca3..cbe950ff 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\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"
@@ -741,9 +741,6 @@ msgstr "bn"
msgid "Commands"
msgstr "Kommandoer"
-msgid "Error while accessing recording!"
-msgstr "Fejl ved lsning af optagelse!"
-
msgid "Delete recording?"
msgstr "Slet optagelse?"
@@ -1392,3 +1389,6 @@ msgstr "Disk"
msgid "free"
msgstr "fri"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Fejl ved lsning af optagelse!"
diff --git a/po/de_DE.po b/po/de_DE.po
index facf813f..1177d937 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2010-01-16 16:46+0100\n"
"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
"Language-Team: German <vdr@linuxtv.org>\n"
@@ -741,9 +741,6 @@ msgstr "ffnen"
msgid "Commands"
msgstr "Befehle"
-msgid "Error while accessing recording!"
-msgstr "Fehler beim Ansprechen der Aufzeichnung!"
-
msgid "Delete recording?"
msgstr "Aufzeichnung lschen?"
@@ -1392,3 +1389,6 @@ msgstr "Disk"
msgid "free"
msgstr "frei"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Fehler beim Ansprechen der Aufzeichnung!"
diff --git a/po/el_GR.po b/po/el_GR.po
index 5248bacc..05f9e71d 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\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"
@@ -741,9 +741,6 @@ msgstr ""
msgid "Commands"
msgstr ""
-msgid "Error while accessing recording!"
-msgstr " !"
-
msgid "Delete recording?"
msgstr " ?"
@@ -1392,3 +1389,6 @@ msgstr ""
msgid "free"
msgstr ""
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr " !"
diff --git a/po/es_ES.po b/po/es_ES.po
index 5169957c..9885f84d 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\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"
@@ -742,9 +742,6 @@ msgstr "Abrir"
msgid "Commands"
msgstr "rdenes"
-msgid "Error while accessing recording!"
-msgstr "Error al acceder a la grabacin!"
-
msgid "Delete recording?"
msgstr "Eliminar grabacion?"
@@ -1393,3 +1390,6 @@ msgstr "Disco"
msgid "free"
msgstr "libre"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Error al acceder a la grabacin!"
diff --git a/po/et_EE.po b/po/et_EE.po
index fa61338d..d9b0d77b 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\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"
@@ -741,9 +741,6 @@ msgstr "Avada"
msgid "Commands"
msgstr "Käsud"
-msgid "Error while accessing recording!"
-msgstr "Salvestuse taasesitus nurjus!"
-
msgid "Delete recording?"
msgstr "Kustutada salvestus?"
@@ -1392,3 +1389,6 @@ msgstr "Ketas"
msgid "free"
msgstr "vaba"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Salvestuse taasesitus nurjus!"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index dfafbf41..0dd0d59c 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2007-08-15 15:52+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -744,9 +744,6 @@ msgstr "Avaa"
msgid "Commands"
msgstr "Komennot"
-msgid "Error while accessing recording!"
-msgstr "Tallenteen toistaminen epäonnistui!"
-
msgid "Delete recording?"
msgstr "Poistetaanko tallenne?"
@@ -1395,3 +1392,6 @@ msgstr "Levy"
msgid "free"
msgstr "vapaana"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Tallenteen toistaminen epäonnistui!"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 937e67b9..0ded14e5 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2008-02-27 18:14+0100\n"
"Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
"Language-Team: French <vdr@linuxtv.org>\n"
@@ -747,9 +747,6 @@ msgstr "Ouvrir"
msgid "Commands"
msgstr "Commandes"
-msgid "Error while accessing recording!"
-msgstr "Impossible d'accder l'enregistrement"
-
msgid "Delete recording?"
msgstr "Supprimer l'enregistrement ?"
@@ -1398,3 +1395,6 @@ msgstr "Disque"
msgid "free"
msgstr "restant"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Impossible d'accder l'enregistrement"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index d9229835..c7c65711 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\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"
@@ -743,9 +743,6 @@ msgstr "Otvori"
msgid "Commands"
msgstr "Naredbe"
-msgid "Error while accessing recording!"
-msgstr "Greka pri pristupanju snimke!"
-
msgid "Delete recording?"
msgstr "Obrisati snimku?"
@@ -1394,3 +1391,6 @@ msgstr "Disk"
msgid "free"
msgstr "slobodno"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Greka pri pristupanju snimke!"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index c87b8612..19aec438 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2012-01-02 11:54+0200\n"
"Last-Translator: Istvn Fley <ifuley@tigercomp.ro>\n"
"Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -744,9 +744,6 @@ msgstr "Kinyitni"
msgid "Commands"
msgstr "Parancsok"
-msgid "Error while accessing recording!"
-msgstr "Hiba a felvtel hozzfrsnl"
-
msgid "Delete recording?"
msgstr "Felvtel trlse?"
@@ -1396,3 +1393,6 @@ msgstr "Lemez"
msgid "free"
msgstr "szabad"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Hiba a felvtel hozzfrsnl"
diff --git a/po/it_IT.po b/po/it_IT.po
index d006e2d2..6d0bd7c9 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2012-06-06 22:50+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -748,9 +748,6 @@ msgstr "Apri"
msgid "Commands"
msgstr "Comandi"
-msgid "Error while accessing recording!"
-msgstr "Errore accesso alla registrazione!"
-
msgid "Delete recording?"
msgstr "Eliminare la registrazione?"
@@ -1399,3 +1396,6 @@ msgstr "Disco"
msgid "free"
msgstr "disponibili"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Errore accesso alla registrazione!"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 2df9c0f6..d2edb6ec 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.16\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\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"
@@ -741,9 +741,6 @@ msgstr "Atidaryti"
msgid "Commands"
msgstr "Komandos"
-msgid "Error while accessing recording!"
-msgstr "Klaida atidarant įrašą!"
-
msgid "Delete recording?"
msgstr "Ištrinti įrašą?"
@@ -1392,3 +1389,6 @@ msgstr "Diskas"
msgid "free"
msgstr "laisva"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Klaida atidarant įrašą!"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index d0d2f8ff..8a6dc585 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR-1.7.14\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\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"
@@ -742,9 +742,6 @@ msgstr "Отвори"
msgid "Commands"
msgstr "Наредби"
-msgid "Error while accessing recording!"
-msgstr "Грешка при пристап до снимката!"
-
msgid "Delete recording?"
msgstr "Избриши снимка?"
@@ -1393,3 +1390,6 @@ msgstr "Диск"
msgid "free"
msgstr "слободен"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Грешка при пристап до снимката!"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 6ebdaacc..958411c0 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2008-02-26 17:20+0100\n"
"Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
"Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -745,9 +745,6 @@ msgstr "Openen"
msgid "Commands"
msgstr "Commando's"
-msgid "Error while accessing recording!"
-msgstr "Fout bij lezen opname!"
-
msgid "Delete recording?"
msgstr "Opname verwijderen?"
@@ -1396,3 +1393,6 @@ msgstr "Schijf"
msgid "free"
msgstr "vrij"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Fout bij lezen opname!"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 1dc04398..2aa373e0 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\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"
@@ -742,9 +742,6 @@ msgstr "pne"
msgid "Commands"
msgstr "Kommandoer"
-msgid "Error while accessing recording!"
-msgstr "Feil under lesing av opptak!"
-
msgid "Delete recording?"
msgstr "Slette opptak?"
@@ -1393,3 +1390,6 @@ msgstr "Disk"
msgid "free"
msgstr "ledig"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Feil under lesing av opptak!"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 58186b18..0e6f0981 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2008-03-09 12:59+0100\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -742,9 +742,6 @@ msgstr "Otwrz"
msgid "Commands"
msgstr "Polecenia"
-msgid "Error while accessing recording!"
-msgstr "Bld podczas dostpu do nagrania!"
-
msgid "Delete recording?"
msgstr "Usun nagranie?"
@@ -1393,3 +1390,6 @@ msgstr "Dysk"
msgid "free"
msgstr "wolnego"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Bld podczas dostpu do nagrania!"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 86ead151..e1327692 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.15\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\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"
@@ -742,9 +742,6 @@ msgstr "Abrir"
msgid "Commands"
msgstr "Comandos"
-msgid "Error while accessing recording!"
-msgstr "Erro a aceder s gravaes!"
-
msgid "Delete recording?"
msgstr "Eliminar gravao?"
@@ -1393,3 +1390,6 @@ msgstr "Disco"
msgid "free"
msgstr "livre"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Erro a aceder s gravaes!"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index c7018c70..d5d64210 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.12\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2012-11-05 01:28+0100\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -744,9 +744,6 @@ msgstr "Deschide"
msgid "Commands"
msgstr "Comenzi"
-msgid "Error while accessing recording!"
-msgstr "Eroare la accesarea înregistrării"
-
msgid "Delete recording?"
msgstr "Şterg înregistrarea?"
@@ -1395,3 +1392,6 @@ msgstr "Disc"
msgid "free"
msgstr "liber"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Eroare la accesarea înregistrării"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index e35bee27..892cfe78 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2008-12-15 14:37+0100\n"
"Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
"Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -742,9 +742,6 @@ msgstr ""
msgid "Commands"
msgstr ""
-msgid "Error while accessing recording!"
-msgstr " !"
-
msgid "Delete recording?"
msgstr " ?"
@@ -1393,3 +1390,6 @@ msgstr ""
msgid "free"
msgstr ""
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr " !"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 8750abe6..48d882b5 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.16\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2011-02-15 16:29+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -741,9 +741,6 @@ msgstr "Otvori"
msgid "Commands"
msgstr "Prkazy"
-msgid "Error while accessing recording!"
-msgstr "Chyba pri prstupe k nahrvkam!"
-
msgid "Delete recording?"
msgstr "Zmaza nahrvku?"
@@ -1392,3 +1389,6 @@ msgstr "Disk"
msgid "free"
msgstr "volne"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Chyba pri prstupe k nahrvkam!"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index d1f38503..75514bce 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2008-02-28 19:44+0100\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -742,9 +742,6 @@ msgstr "Odpri"
msgid "Commands"
msgstr "Ukazi"
-msgid "Error while accessing recording!"
-msgstr "Napaka pri dostopu do posnetka!"
-
msgid "Delete recording?"
msgstr "Izbrii posnetek?"
@@ -1393,3 +1390,6 @@ msgstr "Disk"
msgid "free"
msgstr "prosto"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Napaka pri dostopu do posnetka!"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 3b8a7a37..51196479 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.1\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2011-01-09 15:57+0100\n"
"Last-Translator: Milan Cvijanovi <elcom_cvijo@hotmail.com>\n"
"Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -750,9 +750,6 @@ msgstr "Meni"
msgid "Commands"
msgstr "Naredbe"
-msgid "Error while accessing recording!"
-msgstr "Greka prilikom pristupa snimanju!"
-
msgid "Delete recording?"
msgstr "Obrii snimku?"
@@ -1419,3 +1416,6 @@ msgstr "Disk"
msgid "free"
msgstr "slobodno"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Greka prilikom pristupa snimanju!"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 6c32464e..067adf55 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2008-03-12 18:25+0100\n"
"Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
"Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -744,9 +744,6 @@ msgstr "ppna"
msgid "Commands"
msgstr "Kommandon"
-msgid "Error while accessing recording!"
-msgstr "Inspelningen gr inte att lsa!"
-
msgid "Delete recording?"
msgstr "Ta bort inspelningen?"
@@ -1395,3 +1392,6 @@ msgstr "Disk"
msgid "free"
msgstr "ledigt"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Inspelningen gr inte att lsa!"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 9f228002..78177e75 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2008-02-28 00:33+0100\n"
"Last-Translator: Oktay Yolgeen <oktay_73@yahoo.de>\n"
"Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -741,9 +741,6 @@ msgstr "A"
msgid "Commands"
msgstr "Komutlar"
-msgid "Error while accessing recording!"
-msgstr "Kayt okuma hatas!"
-
msgid "Delete recording?"
msgstr "Kayt sil?"
@@ -1392,3 +1389,6 @@ msgstr "Disk"
msgid "free"
msgstr "bo"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Kayt okuma hatas!"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 48eff5d2..edc5a7c8 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2010-04-25 16:35+0200\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
"Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -741,9 +741,6 @@ msgstr "Відкрити"
msgid "Commands"
msgstr "Команди"
-msgid "Error while accessing recording!"
-msgstr "Помилка доступу до запису!"
-
msgid "Delete recording?"
msgstr "Витерти запис?"
@@ -1392,3 +1389,6 @@ msgstr "Диск"
msgid "free"
msgstr "вільно"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Помилка доступу до запису!"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 07cdf320..73e84fd4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-05 12:48+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
"PO-Revision-Date: 2009-09-23 23:50+0800\n"
"Last-Translator: Nan Feng <nfgx@21cn.com>\n"
"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -744,9 +744,6 @@ msgstr "打开"
msgid "Commands"
msgstr "常用操作命令"
-msgid "Error while accessing recording!"
-msgstr "存取录像错误！"
-
msgid "Delete recording?"
msgstr "是否删除录像？"
@@ -1395,3 +1392,6 @@ msgstr "硬盘已使用"
msgid "free"
msgstr "可录像时间"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "存取录像错误！"
diff --git a/skins.h b/skins.h
index c108e359..25061268 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: skins.h 2.6 2012/12/02 13:23:44 kls Exp $
+ * $Id: skins.h 2.7 2012/12/07 17:18:44 kls Exp $
*/
#ifndef __SKINS_H
@@ -17,6 +17,7 @@
#include "recording.h"
#include "themes.h"
#include "thread.h"
+#include "timers.h"
#include "tools.h"
enum eMessageType { mtStatus = 0, mtInfo, mtWarning, mtError }; // will be used to calculate color offsets!
@@ -152,13 +153,43 @@ public:
///< this function will be first called for the old current item
///< with Current set to false, and then for the new current item
///< with Current set to true.
- /*TODO
- virtual void SetItem(const cEvent *Event, int Index, bool Current, bool Selectable, bool NowNext???, bool Schedule???);
- virtual void SetItem(const cTimer *Timer, int Index, bool Current, bool Selectable);
- virtual void SetItem(const cChannel *Channel, int Index, bool Current, bool Selectable);
- virtual void SetItem(const cRecording *Recording, int Index, bool Current, bool Selectable);
- --> false: call SetItem(text)
- */
+ virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, int TimerMatch) { return false; }
+ ///< Sets the item at the given Index to Event. See SetItem() for more information.
+ ///< If a derived skin class implements this function, it can display an Event item
+ ///< in a more elaborate way than just a simple line of text.
+ ///< If Channel is not NULL, the channel's name and/or number shall be displayed.
+ ///< If WithDate is true, the date of the Event shall be displayed (in addition to the time).
+ ///< TimerMatch tells how much of this event will be recorded by a timer.
+ ///< If the skin displays the Event item in its own way, it shall return true.
+ ///< The default implementation does nothing and returns false, which results in
+ ///< a call to SetItem() with a proper text.
+ virtual bool SetItemTimer(const cTimer *Timer, int Index, bool Current, bool Selectable) { return false; }
+ ///< Sets the item at the given Index to Timer. See SetItem() for more information.
+ ///< If a derived skin class implements this function, it can display a Timer item
+ ///< in a more elaborate way than just a simple line of text.
+ ///< If the skin displays the Timer item in its own way, it shall return true.
+ ///< The default implementation does nothing and returns false, which results in
+ ///< a call to SetItem() with a proper text.
+ virtual bool SetItemChannel(const cChannel *Channel, int Index, bool Current, bool Selectable, bool WithProvider) { return false; }
+ ///< Sets the item at the given Index to Channel. See SetItem() for more information.
+ ///< If a derived skin class implements this function, it can display a Channel item
+ ///< in a more elaborate way than just a simple line of text.
+ ///< If WithProvider ist true, the provider shall be displayed in addition to the
+ ///< channel's name.
+ ///< If the skin displays the Channel item in its own way, it shall return true.
+ ///< The default implementation does nothing and returns false, which results in
+ ///< a call to SetItem() with a proper text.
+ virtual bool SetItemRecording(const cRecording *Recording, int Index, bool Current, bool Selectable, int Level, int Total, int New) { return false; }
+ ///< Sets the item at the given Index to Recording. See SetItem() for more information.
+ ///< If a derived skin class implements this function, it can display a Recording item
+ ///< in a more elaborate way than just a simple line of text.
+ ///< Level is the currently displayed level of the video directory, where 0 is the
+ ///< top level. A value of -1 means that the full path names of the recordings
+ ///< shall be displayed. If Total is greater than 0, this is a directory with the given
+ ///< total number of entries, and New contains the number of new (unwatched) recordings.
+ ///< If the skin displays the Recording item in its own way, it shall return true.
+ ///< The default implementation does nothing and returns false, which results in
+ ///< a call to SetItem() with a proper text.
virtual void SetScrollbar(int Total, int Offset);
///< Sets the Total number of items in the currently displayed list, and the
///< Offset of the first item that is currently displayed (the skin knows how
diff --git a/timers.c b/timers.c
index a29cf12f..ab8e4778 100644
--- 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 2.14 2012/10/16 08:22:39 kls Exp $
+ * $Id: timers.c 2.15 2012/12/07 13:14:00 kls Exp $
*/
#include "timers.h"
@@ -480,7 +480,7 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
#define FULLMATCH 1000
-int cTimer::Matches(const cEvent *Event, int *Overlap) const
+eTimerMatch cTimer::Matches(const cEvent *Event, int *Overlap) const
{
// Overlap is the percentage of the Event's duration that is covered by
// this timer (based on FULLMATCH for finer granularity than just 100).
@@ -758,12 +758,12 @@ cTimer *cTimers::GetMatch(time_t t)
return t0;
}
-cTimer *cTimers::GetMatch(const cEvent *Event, int *Match)
+cTimer *cTimers::GetMatch(const cEvent *Event, eTimerMatch *Match)
{
cTimer *t = NULL;
- int m = tmNone;
+ eTimerMatch m = tmNone;
for (cTimer *ti = First(); ti; ti = Next(ti)) {
- int tm = ti->Matches(Event);
+ eTimerMatch tm = ti->Matches(Event);
if (tm > m) {
t = ti;
m = tm;
diff --git a/timers.h b/timers.h
index e77b3946..cde8b3bd 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: timers.h 2.4 2012/06/02 12:10:00 kls Exp $
+ * $Id: timers.h 2.5 2012/12/07 13:13:40 kls Exp $
*/
#ifndef __TIMERS_H
@@ -77,7 +77,7 @@ public:
static time_t SetTime(time_t t, int SecondsFromMidnight);
void SetFile(const char *File);
bool Matches(time_t t = 0, bool Directly = false, int Margin = 0) const;
- int Matches(const cEvent *Event, int *Overlap = NULL) const;
+ eTimerMatch Matches(const cEvent *Event, int *Overlap = NULL) const;
bool Expired(void) const;
time_t StartTime(void) const;
time_t StopTime(void) const;
@@ -116,7 +116,7 @@ public:
cTimers(void);
cTimer *GetTimer(cTimer *Timer);
cTimer *GetMatch(time_t t);
- cTimer *GetMatch(const cEvent *Event, int *Match = NULL);
+ cTimer *GetMatch(const cEvent *Event, eTimerMatch *Match = NULL);
cTimer *GetNextActiveTimer(void);
int BeingEdited(void) { return beingEdited; }
void IncBeingEdited(void) { beingEdited++; }
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 17:23:24 +0000