[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-259-g60b9400

[Thilo G. <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  60b94000dd45add3c5500d695414e9c0088a1839 (commit)
       via  4c00b3bb3e5e3843648a905114e454790a46cc22 (commit)
       via  811be23c9c30430b4f83281ce1e4972dc7f348b1 (commit)
       via  803552f7a379b4d434f1d28fb27b27d2aebdeee6 (commit)
       via  cc3e7a66fbe098e78d50afa1b9b372bfb6752133 (commit)
       via  12ab0b7e20b05ddb3afe89356294d69e11e7093f (commit)
       via  a08e7fedbaf7eb76ab8302a9fd5c8b1a9ada5814 (commit)
       via  1b5381ba119db406d542e2a88f705c4e96421989 (commit)
       via  b5685c0abf361202341745a2a57a7b63c0e38561 (commit)
       via  358d43f095c2a123e4a45f8760872865b317da2a (commit)
       via  406febf33d8bbac872cdb1adae8afdfd09a5cee2 (commit)
       via  8fdfcc1e28e9f407f6858606e2fa105437e99377 (commit)
       via  0a0e89f81e7fb03b165a693426ff782e0cd298d7 (commit)
       via  b2bf57b1861aafc5ffd3a23e97023436eb43d124 (commit)
       via  16d3f5ec18c7a3a736179a631716c1603460b16b (commit)
       via  775a5153d57c5ece8e42fd420c02097762b1028b (commit)
       via  abd52a350476743defc79e8319aeb81d4357074d (commit)
       via  dbaf75c798c74807f44491b4ec022c2661720d1f (commit)
       via  3c09ec2c982938669836f3e139d3f3973e68deef (commit)
       via  907effcb1b7b412e04ac6913a538bdf9dd75e9cb (commit)
      from  b0d16a5af89815a4de0478a20b356abb2c0f0534 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 60b94000dd45add3c5500d695414e9c0088a1839
Author: Christian Schuett <Gau...@ho...>
Date:   Fri Oct 4 22:03:32 2013 +0200

    Neutrino: consider event start time when finding current and selected ...
    
    ... event in alphabetically sorted event list
    
    events can have the same id with different start times, so maybe the wrong
    entries are marked
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index 759978d..93da0d2 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -354,7 +354,9 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
 				continue;
 
 			event_id_t current_event_id = (current_event > -1) ? evtlist[current_event].eventID : 0;
+			time_t current_event_start_time = (current_event > -1) ? evtlist[current_event].startTime : 0;
 			event_id_t selected_id = evtlist[selected].eventID;
+			time_t selected_start_time = evtlist[selected].startTime;
 			if(sort_mode==0)
 			{
 				sort_mode++;
@@ -370,14 +372,16 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
 			{
 				for (current_event = 0; current_event < (int)evtlist.size(); current_event++)
 				{
-					if (evtlist[current_event].eventID == current_event_id)
+					if (evtlist[current_event].eventID == current_event_id &&
+					    evtlist[current_event].startTime == current_event_start_time)
 						break;
 				}
 			}
 			// find selected
 			for ( selected=0 ; selected < evtlist.size(); selected++ )
 			{
-				if ( evtlist[selected].eventID == selected_id )
+				if (evtlist[selected].eventID == selected_id &&
+				    evtlist[selected].startTime == selected_start_time)
 					break;
 			}
 			oldselected=selected;

commit 4c00b3bb3e5e3843648a905114e454790a46cc22
Author: Christian Schuett <Gau...@ho...>
Date:   Thu Oct 3 17:57:06 2013 +0200

    Neutrino: fix current event marker in alphabetically sorted event list
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index dc9e2f7..759978d 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -353,7 +353,8 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
 			if (showfollow)
 				continue;
 
-			unsigned long long selected_id = evtlist[selected].eventID;
+			event_id_t current_event_id = (current_event > -1) ? evtlist[current_event].eventID : 0;
+			event_id_t selected_id = evtlist[selected].eventID;
 			if(sort_mode==0)
 			{
 				sort_mode++;
@@ -364,6 +365,15 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
 				sort_mode=0;
 				sort(evtlist.begin(),evtlist.end(),sortByDateTime);
 			}
+			// find current
+			if (current_event > -1)
+			{
+				for (current_event = 0; current_event < (int)evtlist.size(); current_event++)
+				{
+					if (evtlist[current_event].eventID == current_event_id)
+						break;
+				}
+			}
 			// find selected
 			for ( selected=0 ; selected < evtlist.size(); selected++ )
 			{

commit 811be23c9c30430b4f83281ce1e4972dc7f348b1
Author: Christian Schuett <Gau...@ho...>
Date:   Thu Oct 3 14:54:29 2013 +0200

    Neutrino: make member 'text' of CMenuSeparator protected
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/widget/menue.cpp b/tuxbox/neutrino/src/gui/widget/menue.cpp
index 6dca5fb..13aaf64 100644
--- a/tuxbox/neutrino/src/gui/widget/menue.cpp
+++ b/tuxbox/neutrino/src/gui/widget/menue.cpp
@@ -1228,8 +1228,7 @@ int CMenuSeparator::paint(bool /*selected*/)
 	}
 	if ((type & STRING))
 	{
-		const char * l_text;
-		l_text = getString();
+		const char * l_text = getString();
 	
 		if (text != NONEXISTANT_LOCALE || strlen(l_text) != 0)
 		{
diff --git a/tuxbox/neutrino/src/gui/widget/menue.h b/tuxbox/neutrino/src/gui/widget/menue.h
index af095e2..3ce475c 100644
--- a/tuxbox/neutrino/src/gui/widget/menue.h
+++ b/tuxbox/neutrino/src/gui/widget/menue.h
@@ -137,11 +137,10 @@ class CMenuSeparator : public CMenuItem
 		int               type;
 
 	protected:
+		neutrino_locale_t text;
 		std::string	  separator_text;
 
 	public:
-		neutrino_locale_t text;
-
 		enum
 		{
 			EMPTY =	0,
@@ -161,7 +160,7 @@ class CMenuSeparator : public CMenuItem
 		int getHeight(void) const;
 
 		virtual const char * getString(void);
-		virtual void setString(const std::string& text);
+		virtual void setString(const std::string& s_text);
 };
 
 class CMenuForwarder : public CMenuItem

commit 803552f7a379b4d434f1d28fb27b27d2aebdeee6
Author: Christian Schuett <Gau...@ho...>
Date:   Wed Oct 2 21:51:43 2013 +0200

    Neutrino: simplify CKeyValue, also rename a member of CMenuForwarder
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/widget/keychooser.cpp b/tuxbox/neutrino/src/gui/widget/keychooser.cpp
index f45b291..7190d2a 100644
--- a/tuxbox/neutrino/src/gui/widget/keychooser.cpp
+++ b/tuxbox/neutrino/src/gui/widget/keychooser.cpp
@@ -45,7 +45,6 @@
 
 class CKeyValue : public CMenuSeparator
 {
-	std::string the_text;
 public:
 	int         keyvalue;
 
@@ -55,10 +54,10 @@ public:
 
 	virtual const char * getString(void)
 		{
-			the_text  = g_Locale->getText(LOCALE_KEYCHOOSERMENU_CURRENTKEY);
-			the_text += ": ";
-			the_text += CRCInput::getKeyName(keyvalue);
-			return the_text.c_str();
+			separator_text  = g_Locale->getText(text);
+			separator_text += ": ";
+			separator_text += CRCInput::getKeyName(keyvalue);
+			return separator_text.c_str();
 		};
 };
 
diff --git a/tuxbox/neutrino/src/gui/widget/menue.cpp b/tuxbox/neutrino/src/gui/widget/menue.cpp
index 672603c..6dca5fb 100644
--- a/tuxbox/neutrino/src/gui/widget/menue.cpp
+++ b/tuxbox/neutrino/src/gui/widget/menue.cpp
@@ -1068,7 +1068,7 @@ CMenuForwarder::CMenuForwarder(const char * const Text, const bool Active, const
 	option = Option;
 	option_string = NULL;
 	text = NONEXISTANT_LOCALE;
-	the_text = Text;
+	forwarder_text = Text;
 	active = Active;
 	jumpTarget = Target;
 	actionKey = ActionKey ? ActionKey : "";
@@ -1081,7 +1081,7 @@ CMenuForwarder::CMenuForwarder(const char * const Text, const bool Active, const
 	option = NULL;
 	option_string = &Option;
 	text = NONEXISTANT_LOCALE;
-	the_text = Text;
+	forwarder_text = Text;
 	active = Active;
 	jumpTarget = Target;
 	actionKey = ActionKey ? ActionKey : "";
@@ -1118,7 +1118,7 @@ void CMenuForwarder::setTextLocale(const neutrino_locale_t Text)
 // Without this, the changeNotifiers would become machine-dependent.
 void CMenuForwarder::setText(const char * const Text)
 {
-	the_text = Text;
+	forwarder_text = Text;
 
 	if (used && x != -1)
 		paint();
@@ -1151,7 +1151,7 @@ const char * CMenuForwarder::getName(void)
 {
 	if (text != NONEXISTANT_LOCALE)
 		return g_Locale->getText(text);
-	return the_text.c_str();
+	return forwarder_text.c_str();
 }
 
 int CMenuForwarder::paint(bool selected)
diff --git a/tuxbox/neutrino/src/gui/widget/menue.h b/tuxbox/neutrino/src/gui/widget/menue.h
index fbbe821..af095e2 100644
--- a/tuxbox/neutrino/src/gui/widget/menue.h
+++ b/tuxbox/neutrino/src/gui/widget/menue.h
@@ -135,6 +135,8 @@ class CMenuItem
 class CMenuSeparator : public CMenuItem
 {
 		int               type;
+
+	protected:
 		std::string	  separator_text;
 
 	public:
@@ -171,7 +173,7 @@ class CMenuForwarder : public CMenuItem
 
  protected:
 	neutrino_locale_t text;
-	std::string the_text;
+	std::string forwarder_text;
 
 	virtual const char * getOption(void);
 	virtual const char * getName(void);

commit cc3e7a66fbe098e78d50afa1b9b372bfb6752133
Author: Christian Schuett <Gau...@ho...>
Date:   Wed Oct 2 20:10:04 2013 +0200

    Neutrino: fix current event marker in event list and EPG search
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index 4f7ab49..dc9e2f7 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -93,7 +93,7 @@ EventList::EventList()
 {
 	frameBuffer = CFrameBuffer::getInstance();
 	selected = 0;
-	current_event = 0;
+	current_event = -1;
 	
 	m_search_list = SEARCH_LIST_NONE;
 	m_search_epg_item = SEARCH_LIST_NONE;
@@ -242,7 +242,7 @@ void EventList::readEvents(const t_channel_id channel_id)
 		sort(evtlist.begin(),evtlist.end(),sortByDateTime);
 	}
 
-	current_event = (unsigned int)-1;
+	current_event = -1;
 	for ( e=evtlist.begin(); e!=evtlist.end(); ++e )
 	{
 		if ( e->startTime > azeit ) {
@@ -258,12 +258,19 @@ void EventList::readEvents(const t_channel_id channel_id)
 		evt.description = ZapitTools::UTF8_to_Latin1(g_Locale->getText(LOCALE_EPGLIST_NOEVENTS));
 #warning FIXME: evtlist should be utf8-encoded
 		evt.eventID = 0;
+		evt.startTime = 0;
+		evt.duration = 0;
 		evtlist.push_back(evt);
 
 	}
-	if (current_event == (unsigned int)-1)
-		current_event = 0;
-	selected= current_event;
+	if (current_event > -1)
+	{
+		selected = current_event;
+		if (evtlist[current_event].startTime + (long)evtlist[current_event].duration < azeit)
+			current_event = -1;
+	}
+	else
+		selected = 0;
 
 	return;
 }
@@ -631,7 +638,7 @@ void EventList::paintItem(unsigned int pos)
 		bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
 		c_rad_mid = RADIUS_MID;
 	}
-	else if (curpos == current_event)
+	else if ((int)curpos == current_event)
 	{
 		color   = COL_MENUCONTENT + 1;
 		bgcolor = COL_MENUCONTENT_PLUS_1;
@@ -993,7 +1000,7 @@ int EventList::findEvents(void)
 		// remove duplicates
 		evtlist.resize(unique(evtlist.begin(), evtlist.end(), uniqueByIdAndDateTime) - evtlist.begin());
 #endif
-		current_event = (unsigned int)-1;
+		current_event = -1;
 		time_t azeit=time(NULL);
 		
 		CChannelEventList::iterator e;
@@ -1008,12 +1015,20 @@ int EventList::findEvents(void)
 		{
 			CChannelEvent evt;
 			evt.description = ZapitTools::UTF8_to_Latin1(g_Locale->getText(LOCALE_EPGLIST_NOEVENTS));
+#warning FIXME: evtlist should be utf8-encoded
 			evt.eventID = 0;
+			evt.startTime = 0;
+			evt.duration = 0;
 			evtlist.push_back(evt);
 		}
-		if (current_event == (unsigned int)-1)
-			current_event = 0;
-		selected= current_event;
+		if (current_event > -1)
+		{
+			selected = current_event;
+			if (evtlist[current_event].startTime + (long)evtlist[current_event].duration < azeit)
+				current_event = -1;
+		}
+		else
+			selected = 0;
 		
 		name = (std::string)g_Locale->getText(LOCALE_EVENTFINDER_SEARCH) + ": '" + ZapitTools::Latin1_to_UTF8(m_search_keyword.c_str()) + "'";
 	}
diff --git a/tuxbox/neutrino/src/gui/eventlist.h b/tuxbox/neutrino/src/gui/eventlist.h
index c892eb8..2fb7417 100644
--- a/tuxbox/neutrino/src/gui/eventlist.h
+++ b/tuxbox/neutrino/src/gui/eventlist.h
@@ -90,10 +90,10 @@ class EventList
 		CChannelEventList evtlist;
 		void readEvents(const t_channel_id channel_id);
 		unsigned int	selected;
-		unsigned int	current_event;
 		unsigned int	liststart;
 		unsigned int	listmaxshow;
 		unsigned int	numwidth;
+		int		current_event;
 		int		fheight; // Fonthoehe Channellist-Inhalt
 		int		fheight1,fheight2;
 		int		fwidth1,fwidth2;

commit 12ab0b7e20b05ddb3afe89356294d69e11e7093f
Author: Christian Schuett <Gau...@ho...>
Date:   Wed Oct 2 18:21:48 2013 +0200

    nhttpd controlapi: add possibility to get timers in XML format
    
    ported from Coolstream Git
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
index 17e9f04..b667f54 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -169,7 +169,7 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]=
 	{"vcroutput", 		&CControlAPI::VCROutputCGI,	"text/plain"},
 	{"scartmode", 		&CControlAPI::ScartModeCGI,	"text/plain"},
 	// timer
-	{"timer", 		&CControlAPI::TimerCGI,		"text/plain"},
+	{"timer", 		&CControlAPI::TimerCGI,		""},
 	// bouquet editing
 	{"setbouquet", 		&CControlAPI::setBouquetCGI,	"text/plain"},
 	{"savebouquet",		&CControlAPI::saveBouquetCGI,	"text/plain"},
@@ -251,6 +251,7 @@ void CControlAPI::TimerCGI(CyhookHandler *hh)
 	{
 		if (!hh->ParamList.empty() && hh->ParamList["format"].empty())
 		{
+			hh->SetHeader(HTTP_OK, "text/plain; charset=iso-8859-1");
 			if (hh->ParamList["action"] == "new")
 				doNewTimer(hh);
 			else if (hh->ParamList["action"] == "modify")
@@ -275,7 +276,12 @@ void CControlAPI::TimerCGI(CyhookHandler *hh)
 
 		}
 		else
-			SendTimers(hh);
+		{
+			if (hh->ParamList["format"] == "xml")
+				SendTimersXML(hh);
+			else
+				SendTimers(hh);
+		}
 	}
 	else
 		hh->SendError();
@@ -1662,6 +1668,8 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
 	NeutrinoAPI->Timerd->getTimerList(timerlist);
 	CTimerd::TimerList::iterator timer = timerlist.begin();
 
+	hh->SetHeader(HTTP_OK, "text/plain; charset=iso-8859-1");
+
 	for(; timer != timerlist.end();timer++)
 	{
 		// Add Data
@@ -1718,6 +1726,227 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
 }
 
 //-----------------------------------------------------------------------------
+void CControlAPI::_SendTime(CyhookHandler *hh, struct tm *Time, int digits)
+{
+	char zTime[25] = {0};
+	char zDate[25] = {0};
+	strftime(zTime, 20, "%H:%M", Time);
+	strftime(zDate, 20, "%d.%m.%Y", Time);
+	hh->printf("\t\t\t\t\t<text>%s %s</text>\n", zDate, zTime);
+	hh->printf("\t\t\t\t\t<date>%s</date>\n", zDate);
+	hh->printf("\t\t\t\t\t<time>%s</time>\n", zTime);
+	hh->printf("\t\t\t\t\t<digits>%d</digits>\n", digits);
+	hh->printf("\t\t\t\t\t<day>%d</day>\n", Time->tm_mday);
+	hh->printf("\t\t\t\t\t<month>%d</month>\n", Time->tm_mon + 1);
+	hh->printf("\t\t\t\t\t<year>%d</year>\n", Time->tm_year + 1900);
+	hh->printf("\t\t\t\t\t<hour>%d</hour>\n", Time->tm_hour);
+	hh->printf("\t\t\t\t\t<min>%d</min>\n", Time->tm_min);
+}
+
+//-----------------------------------------------------------------------------
+void CControlAPI::SendTimersXML(CyhookHandler *hh)
+{
+	// Init local timer iterator
+	CTimerd::TimerList timerlist;			// List of timers
+	NeutrinoAPI->Timerd->getTimerList(timerlist);
+	sort(timerlist.begin(), timerlist.end());		// sort timer
+	CTimerd::TimerList::iterator timer = timerlist.begin();
+
+//	std::string xml_response = "";
+	hh->SetHeader(HTTP_OK, "text/xml; charset=iso-8859-1");
+	hh->WriteLn("<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>");
+	hh->WriteLn("<timer>");
+
+	// general timer configuration
+	hh->WriteLn("\t<config>");
+
+	// Look for Recording Safety Timers too
+	int pre = 0, post = 0;
+	NeutrinoAPI->Timerd->getRecordingSafety(pre, post);
+//	hh->printf("\t\t\t<recording_safety>%d</recording_safety>\n", (int)timer->recordingSafety);
+	hh->printf("\t\t\t<pre_delay>%d</pre_delay>\n", pre);
+	hh->printf("\t\t\t<post_delay>%d</post_delay>\n", post);
+	hh->WriteLn("\t</config>");
+
+	// start timer list
+	hh->WriteLn("\t<timer_list>");
+
+	for(; timer != timerlist.end(); ++timer)
+	{
+		hh->WriteLn("\t\t<timer>");
+		hh->printf("\t\t\t<type>%s</type>\n", (NeutrinoAPI->timerEventType2Str(timer->eventType)).c_str());
+		hh->printf("\t\t\t<id>%d</id>\n", timer->eventID);
+		hh->printf("\t\t\t<state>%d</state>\n", (int)timer->eventState);
+		hh->printf("\t\t\t<type_number>%d</type_number>\n", (int)timer->eventType);
+
+		// alarmtime
+		hh->WriteLn("\t\t\t<alarm>");
+
+		struct tm *alarmTime = localtime(&(timer->alarmTime));
+		hh->WriteLn("\t\t\t\t<normal>");
+		_SendTime(hh, alarmTime, (int)timer->alarmTime);
+		hh->WriteLn("\t\t\t\t</normal>");
+
+		time_t real_alarmTimeT = timer->alarmTime - pre;
+		struct tm *safetyAlarmTime = localtime(&real_alarmTimeT);
+		hh->WriteLn("\t\t\t\t<safety>");
+		_SendTime(hh, safetyAlarmTime, (int)real_alarmTimeT);
+		hh->WriteLn("\t\t\t\t</safety>");
+
+		hh->WriteLn("\t\t\t</alarm>");
+
+		// announcetime
+		hh->WriteLn("\t\t\t<announce>");
+		struct tm *announceTime = localtime(&(timer->announceTime));
+		hh->WriteLn("\t\t\t\t<normal>");
+		_SendTime(hh, announceTime, (int)timer->announceTime);
+		hh->WriteLn("\t\t\t\t</normal>");
+
+		time_t real_announceTimeT = timer->announceTime - pre;
+		struct tm *safetyAnnounceTime = localtime(&real_announceTimeT);
+		hh->WriteLn("\t\t\t\t<safety>");
+		_SendTime(hh, safetyAnnounceTime, (int)real_announceTimeT);
+		hh->WriteLn("\t\t\t\t</safety>");
+
+		hh->WriteLn("\t\t\t</announce>");
+
+		// stoptime
+		if (timer->stopTime > 0)
+		{
+			hh->WriteLn("\t\t\t<stop>");
+			struct tm *stopTime = localtime(&(timer->stopTime));
+			hh->WriteLn("\t\t\t\t<normal>");
+			_SendTime(hh, stopTime, (int)timer->stopTime);
+			hh->WriteLn("\t\t\t\t</normal>");
+
+			time_t real_stopTimeT = timer->stopTime - post;
+			struct tm *safetyStopTime = localtime(&real_stopTimeT);
+			hh->WriteLn("\t\t\t\t<safety>");
+			_SendTime(hh, safetyStopTime, (int)real_stopTimeT);
+			hh->WriteLn("\t\t\t\t</safety>");
+
+			hh->WriteLn("\t\t\t</stop>");
+		}
+
+		// repeat
+		std::string zRep = NeutrinoAPI->timerEventRepeat2Str(timer->eventRepeat);
+		std::string zRepCount;
+		if (timer->eventRepeat == CTimerd::TIMERREPEAT_ONCE)
+			zRepCount = "-";
+		else
+			zRepCount = (timer->repeatCount == 0) ? "&#x221E;" : string_printf("%dx",timer->repeatCount);
+		hh->WriteLn("\t\t\t<repeat>");
+		hh->printf("\t\t\t\t<count>%s</count>\n", zRepCount.c_str());
+		hh->printf("\t\t\t\t<number>%d</number>\n", (int)timer->eventRepeat);
+		hh->printf("\t\t\t\t<text>%s</text>\n", zRep.c_str());
+		char weekdays[8]= {0};
+		NeutrinoAPI->Timerd->setWeekdaysToStr(timer->eventRepeat, weekdays);
+		hh->printf("\t\t\t\t<weekdays>%s</weekdays>\n", weekdays);
+		hh->WriteLn("\t\t\t</repeat>");
+
+		// channel infos
+		std::string channel_name = ZapitTools::UTF8_to_Latin1(NeutrinoAPI->Zapit->getChannelName(timer->channel_id).c_str());
+		if (channel_name.empty())
+			channel_name = NeutrinoAPI->Zapit->isChannelTVChannel(timer->channel_id) ? "Unbekannter TV-Kanal" : "Unbekannter Radiokanal";
+
+		// epg title
+		std::string title = timer->epgTitle;
+		if (timer->epgID != 0)
+		{
+			CEPGData epgdata;
+			if (NeutrinoAPI->Sectionsd->getEPGid(timer->epgID, timer->epg_starttime, &epgdata))
+				title = epgdata.title;
+		}
+
+		// timer specific data
+		switch (timer->eventType)
+		{
+		case CTimerd::TIMER_NEXTPROGRAM :
+			{
+				hh->printf("\t\t\t<channel_id>" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "</channel_id>\n", timer->channel_id);
+				hh->printf("\t\t\t<channel_name><![CDATA[%s]]></channel_name>\n", channel_name.c_str());
+				hh->printf("\t\t\t<title><![CDATA[%s]]></title>\n", title.c_str());
+			}
+			break;
+		case CTimerd::TIMER_ZAPTO :
+			{
+				hh->printf("\t\t\t<channel_id>" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "</channel_id>\n", timer->channel_id);
+				hh->printf("\t\t\t<channel_name><![CDATA[%s]]></channel_name>\n", channel_name.c_str());
+				hh->printf("\t\t\t<title><![CDATA[%s]]></title>\n", title.c_str());
+			}
+			break;
+		case CTimerd::TIMER_RECORD :
+			{
+				hh->printf("\t\t\t<channel_id>" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "</channel_id>\n", timer->channel_id);
+				hh->printf("\t\t\t<channel_name><![CDATA[%s]]></channel_name>\n", channel_name.c_str());
+				hh->printf("\t\t\t<title><![CDATA[%s]]></title>\n", title.c_str());
+
+				// audio
+				if (timer->apids != TIMERD_APIDS_CONF)
+				{
+					hh->WriteLn("\t\t\t<audio>");
+					hh->WriteLn("\t\t\t\t<apids_conf>false</apids_conf>");
+					if (timer->apids & TIMERD_APIDS_STD)
+						hh->WriteLn("\t\t\t\t<apids_std>true</apids_std>");
+					else
+						hh->WriteLn("\t\t\t\t<apids_std>false</apids_std>");
+					if (timer->apids & TIMERD_APIDS_ALT)
+						hh->WriteLn("\t\t\t\t<apids_alt>true</apids_alt>");
+					else
+						hh->WriteLn("\t\t\t\t<apids_alt>false</apids_alt>");
+					if (timer->apids & TIMERD_APIDS_AC3)
+						hh->WriteLn("\t\t\t\t<apids_ac3>true</apids_ac3>");
+					else
+						hh->WriteLn("\t\t\t\t<apids_ac3>false</apids_ac3>");
+					hh->WriteLn("\t\t\t</audio>");
+				}
+				else
+				{
+					hh->WriteLn("\t\t\t<audio>");
+					hh->WriteLn("\t\t\t\t<apids_conf>true</apids_conf>");
+					hh->WriteLn("\t\t\t\t<apids_std>false</apids_std>");
+					hh->WriteLn("\t\t\t\t<apids_alt>false</apids_alt>");
+					hh->WriteLn("\t\t\t\t<apids_ac3>false</apids_ac3>");
+					hh->WriteLn("\t\t\t</audio>");
+				}
+
+				hh->printf("\t\t\t<recording_dir>%s</recording_dir>\n", timer->recordingDir);
+				hh->printf("\t\t\t<epg_id>%d</epg_id>\n", (int)timer->epgID);
+			}
+			break;
+		case CTimerd::TIMER_STANDBY :
+			{
+				hh->printf("\t\t\t<status>%s</status>\n", (timer->standby_on)? "on" : "off");
+			}
+			break;
+		case CTimerd::TIMER_REMIND :
+			{
+				std::string _message;
+				_message = std::string(timer->message).substr(0, 20);
+				hh->printf("\t\t\t<message><![CDATA[%s]]></message>\n", _message.c_str());
+			}
+			break;
+		case CTimerd::TIMER_EXEC_PLUGIN :
+			{
+				hh->printf("\t\t\t<plugin>%s</plugin>\n", timer->pluginName);
+			}
+			break;
+		case CTimerd::TIMER_SLEEPTIMER :
+			{}
+			break;
+		case CTimerd::TIMER_IMMEDIATE_RECORD :
+			{}
+			break;
+		default:
+			{}
+		}
+		hh->WriteLn("\t\t</timer>");
+	}
+	hh->WriteLn("\t</timer_list>");
+	hh->WriteLn("</timer>");
+}
+
+//-----------------------------------------------------------------------------
 // yweb : Extentions
 //-----------------------------------------------------------------------------
 
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.h b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.h
index 7657a73..ab51508 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.h
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.h
@@ -38,11 +38,13 @@ private:
 	void SendBouquet(CyhookHandler *hh,int BouquetNr);
 	void SendChannelList(CyhookHandler *hh);
 	void SendTimers(CyhookHandler *hh);
+	void SendTimersXML(CyhookHandler *hh);
 
 	// subs
 	friend class CNeutrinoWebserver; // for timer /fb/ compatibility
 	void doModifyTimer(CyhookHandler *hh);
 	void doNewTimer(CyhookHandler *hh);
+	void _SendTime(CyhookHandler *hh, struct tm *Time, int digits);
 
 	//yweb
 	void YWeb_SendVideoStreamingPids(CyhookHandler *hh, int apid_no);
@@ -110,7 +112,7 @@ public:
 
 	// virtual functions for HookHandler/Hook
 	virtual std::string getHookName(void) {return std::string("mod_ControlAPI");}
-	virtual std::string 	getHookVersion(void) {return std::string("$Revision: 1.8 $");}
+	virtual std::string 	getHookVersion(void) {return std::string("$Revision: 1.9 $");}
 	virtual THandleStatus Hook_SendResponse(CyhookHandler *hh);
 	virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh);
 };
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp
index 2ffdc1e..dcece93 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp
@@ -334,7 +334,7 @@ std::string CNeutrinoAPI::timerEventType2Str(CTimerd::CTimerEventTypes type)
 		result = "Shutdown";
 		break;
 	case CTimerd::TIMER_NEXTPROGRAM:
-		result = "N&auml;chstes Programm";
+		result = "N&#xE4;chstes Programm";
 		break;
 	case CTimerd::TIMER_ZAPTO:
 		result = "Umschalten";
@@ -349,7 +349,7 @@ std::string CNeutrinoAPI::timerEventType2Str(CTimerd::CTimerEventTypes type)
 		result = "Erinnerung";
 		break;
 	case CTimerd::TIMER_EXEC_PLUGIN:
-		result = "Plugin ausf&uuml;hren";
+		result = "Plugin ausf&#xFC;hren";
 		break;
 	case CTimerd::TIMER_SLEEPTIMER:
 		result = "Sleeptimer";
@@ -371,16 +371,16 @@ std::string CNeutrinoAPI::timerEventRepeat2Str(CTimerd::CTimerEventRepeat rep)
 		result = "einmal";
 		break;
 	case CTimerd::TIMERREPEAT_DAILY:
-		result = "t&auml;glich";
+		result = "t&#xE4;glich";
 		break;
 	case CTimerd::TIMERREPEAT_WEEKLY:
-		result = "w&ouml;chentlich";
+		result = "w&#xF6;chentlich";
 		break;
 	case CTimerd::TIMERREPEAT_BIWEEKLY:
-		result = "2-w&ouml;chentlich";
+		result = "2-w&#xF6;chentlich";
 		break;
 	case CTimerd::TIMERREPEAT_FOURWEEKLY:
-		result = "4-w&ouml;chentlich";
+		result = "4-w&#xF6;chentlich";
 		break;
 	case CTimerd::TIMERREPEAT_MONTHLY:
 		result = "monatlich";

commit a08e7fedbaf7eb76ab8302a9fd5c8b1a9ada5814
Author: Christian Schuett <Gau...@ho...>
Date:   Sun Sep 29 14:52:04 2013 +0200

    Neutrino: use cancel button instead of back button in expert-functions
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/update.cpp b/tuxbox/neutrino/src/gui/update.cpp
index 5b2f934..08e57b1 100644
--- a/tuxbox/neutrino/src/gui/update.cpp
+++ b/tuxbox/neutrino/src/gui/update.cpp
@@ -680,7 +680,7 @@ int CFlashExpert::showMTDSelector(const std::string & actionkey)
 {
 	//mtd-selector erzeugen
 	CMenuWidget* mtdselector = new CMenuWidget(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, NEUTRINO_ICON_UPDATE, width);
-	mtdselector->addIntroItems(LOCALE_FLASHUPDATE_MTDSELECTOR);
+	mtdselector->addIntroItems(LOCALE_FLASHUPDATE_MTDSELECTOR, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
 	CMTDInfo* mtdInfo =CMTDInfo::getInstance();
 	for (int i = 0; i < mtdInfo->getMTDCount(); i++)
 	{
@@ -696,7 +696,7 @@ int CFlashExpert::showMTDSelector(const std::string & actionkey)
 int CFlashExpert::showFileSelector(const std::string & actionkey)
 {
 	CMenuWidget* fileselector = new CMenuWidget(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, NEUTRINO_ICON_UPDATE, width);
-	fileselector->addIntroItems(LOCALE_FLASHUPDATE_FILESELECTOR);
+	fileselector->addIntroItems(LOCALE_FLASHUPDATE_FILESELECTOR, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
 	struct dirent **namelist;
 	int n = scandir("/tmp", &namelist, 0, alphasort);
 	if (n < 0)

commit 1b5381ba119db406d542e2a88f705c4e96421989
Author: Christian Schuett <Gau...@ho...>
Date:   Sun Sep 29 14:44:18 2013 +0200

    Neutrino moviebrowser: add rounded corners to selected item
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/widget/listframe.cpp b/tuxbox/neutrino/src/gui/widget/listframe.cpp
index f0f9b67..fa32990 100644
--- a/tuxbox/neutrino/src/gui/widget/listframe.cpp
+++ b/tuxbox/neutrino/src/gui/widget/listframe.cpp
@@ -570,7 +570,8 @@ void CListFrame::refreshList(void)
 									y, 
 									m_cFrameListRel.iWidth, 
 									m_nFontListHeight,  
-									LIST_BACKGROUND_COLOR_SELECTED);
+									LIST_BACKGROUND_COLOR_SELECTED,
+									RADIUS_SMALL);
 		}
 		int width;
 		int x = m_cFrameListRel.iX + TEXT_BORDER_WIDTH;
@@ -622,7 +623,8 @@ void CListFrame::refreshLine(int line)
 										y, 
 										m_cFrameListRel.iWidth, 
 										m_nFontListHeight,  
-										LIST_BACKGROUND_COLOR_SELECTED);
+										LIST_BACKGROUND_COLOR_SELECTED,
+										RADIUS_SMALL);
 	}
 	else
 	{

commit b5685c0abf361202341745a2a57a7b63c0e38561
Author: Christian Schuett <Gau...@ho...>
Date:   Sat Sep 28 23:22:12 2013 +0200

    Neutrino filebrowser: fix a signed/unsigned comparison compiler warning
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/filebrowser.cpp b/tuxbox/neutrino/src/gui/filebrowser.cpp
index 34ad9cf..115b491 100644
--- a/tuxbox/neutrino/src/gui/filebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/filebrowser.cpp
@@ -1261,7 +1261,7 @@ void CFileBrowser::paintItem(unsigned int pos)
 
 			char f_name[256];
 			std::string FileName = FILESYSTEM_ENCODING_TO_UTF8_STRING(actual_file->getFileName());
-			int i = FileName.length();
+			unsigned int i = FileName.length();
 			sprintf(f_name, "%s", FileName.c_str());
 
 			/* too long? cut it! */

commit 358d43f095c2a123e4a45f8760872865b317da2a
Author: Christian Schuett <Gau...@ho...>
Date:   Sat Sep 28 23:16:36 2013 +0200

    Neutrino: consolidate CMenuForwarderNonLocalized into CMenuForwarder
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/audio_select.cpp b/tuxbox/neutrino/src/gui/audio_select.cpp
index 3cf0ade..7fb16b6 100644
--- a/tuxbox/neutrino/src/gui/audio_select.cpp
+++ b/tuxbox/neutrino/src/gui/audio_select.cpp
@@ -128,7 +128,7 @@ int CAudioSelectMenuHandler::doMenu()
 			std::ostringstream actionKey;
 			actionKey << "AUD: " << i;
 
-			CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(
+			CMenuForwarder* fw = new CMenuForwarder(
 					g_RemoteControl->current_PIDs.APIDs[i].desc,
 					true, NULL, this, actionKey.str().c_str(),
 					CRCInput::convertDigitToKey(++digit));
@@ -183,7 +183,7 @@ int CAudioSelectMenuHandler::doMenu()
 			}
 			text.append(getISO639Description(g_RemoteControl->current_PIDs.SubPIDs[i].desc));
 
-			CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(text.c_str(),
+			CMenuForwarder* fw = new CMenuForwarder(text.c_str(),
 					active, NULL, this, actionKey.str().c_str(),
 					CRCInput::convertDigitToKey(++digit));
 			fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
diff --git a/tuxbox/neutrino/src/gui/drive_setup.cpp b/tuxbox/neutrino/src/gui/drive_setup.cpp
index 5666ba7..a08b1e1 100644
--- a/tuxbox/neutrino/src/gui/drive_setup.cpp
+++ b/tuxbox/neutrino/src/gui/drive_setup.cpp
@@ -801,7 +801,7 @@ void CDriveSetup::showExtMenu(CMenuWidget *extsettings)
 	CMenuForwarder *fw_reset = new CMenuForwarder(LOCALE_DRIVE_SETUP_RESET, true, NULL, this, "reset_drive_setup", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
 
 	//extended settings: filesystem format options
-	vector<CMenuForwarderNonLocalized*> v_fs_opts_items;
+	vector<CMenuForwarder*> v_fs_opts_items;
 	for (size_t i=0; i<MAXCOUNT_FSTYPES; i++){
 		for (size_t j = 0; j<v_fs_modules.size(); j++){
 			if (v_fs_modules[j] != fstype[i].fsname)
@@ -810,8 +810,8 @@ void CDriveSetup::showExtMenu(CMenuWidget *extsettings)
 			if (v_input_fs_options[i] == NULL )
 				v_input_fs_options[i] = new CStringInputSMS(LOCALE_DRIVE_SETUP_ADVANCED_SETTINGS_MODUL_LOADCMD_OPTIONS_INPUT, d_settings.drive_fs_format_option[i], 32,
 								LOCALE_DRIVE_SETUP_ADVANCED_SETTINGS_MODUL_LOADCMD_OPTIONS_INPUT_L1, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz- ");
-			CMenuForwarderNonLocalized * fw_item= NULL;
-			fw_item = new CMenuForwarderNonLocalized(fstype[i].fsname.c_str(), true, d_settings.drive_fs_format_option[i], v_input_fs_options[i]);
+			CMenuForwarder * fw_item= NULL;
+			fw_item = new CMenuForwarder(fstype[i].fsname.c_str(), true, d_settings.drive_fs_format_option[i], v_input_fs_options[i]);
 			v_fs_opts_items.push_back(fw_item);
 		}
 	}
@@ -839,14 +839,14 @@ void CDriveSetup::showExtMenu(CMenuWidget *extsettings)
 void CDriveSetup::showMMCParameterMenu(CMenuWidget* w_mmc)
 {
 	//prepare mmc parameter input
-	std::vector<CMenuForwarderNonLocalized*> v_fw_mmc_load_parameters;
+	std::vector<CMenuForwarder*> v_fw_mmc_load_parameters;
 	for (uint i=0; i < MAXCOUNT_MMC_MODULES; i++){
 		if (v_input_mmc_parameters[i] == NULL)
 			v_input_mmc_parameters[i] = new CStringInputSMS(LOCALE_DRIVE_SETUP_ADVANCED_SETTINGS_MODUL_LOADCMD_OPTIONS_INPUT, &d_settings.drive_mmc_modul_parameter[i], 20, false,
 										LOCALE_DRIVE_SETUP_ADVANCED_SETTINGS_MODUL_MMC_OPTIONS_INPUT_L1, NONEXISTANT_LOCALE, "1234567890abcdefghijklmnopqrstuvwxyz-= ");
 
 		string m_name = have_mmc_modul[i] ? mmc_modules[i]: mmc_modules[i] + " " + g_Locale->getText(LOCALE_DRIVE_SETUP_MMC_MODUL_NOT_INSTALLED);
-		v_fw_mmc_load_parameters.push_back(new CMenuForwarderNonLocalized(m_name.c_str(), have_mmc_modul[i], d_settings.drive_mmc_modul_parameter[i], v_input_mmc_parameters[i]));
+		v_fw_mmc_load_parameters.push_back(new CMenuForwarder(m_name.c_str(), have_mmc_modul[i], d_settings.drive_mmc_modul_parameter[i], v_input_mmc_parameters[i]));
 	}
 
 	//mmc:paint submenue mmc parameters
@@ -971,7 +971,7 @@ void CDriveSetup::showHddSetupSub()
 	string dev_name = g_Locale->getText(mn_data[current_device].entry_locale);
 
 	//menue sub: generate part items
-	CMenuForwarderNonLocalized *sub_part_entry[MAXCOUNT_PARTS];
+	CMenuForwarder *sub_part_entry[MAXCOUNT_PARTS];
 	string partname[MAXCOUNT_PARTS];
 	string item_name[MAXCOUNT_PARTS];
 	for (uint i = 0; i<MAXCOUNT_PARTS; i++) 
@@ -980,7 +980,7 @@ void CDriveSetup::showHddSetupSub()
  		partname[i] = partitions[current_device][i];
 
 		item_name[i] = getPartEntryString(partname[i]).c_str(), isActivePartition(partname[i]);
-		sub_part_entry[i] = new CMenuForwarderNonLocalized(item_name[i].c_str(), isActivePartition(partname[i]), NULL, part[i], NULL/*part_num_actionkey[i]*/, CRCInput::convertDigitToKey(i+1));
+		sub_part_entry[i] = new CMenuForwarder(item_name[i].c_str(), isActivePartition(partname[i]), NULL, part[i], NULL/*part_num_actionkey[i]*/, CRCInput::convertDigitToKey(i+1));
 	}
 	// generate all usable DATA from Device
 	generateAllUsableDataOfDevice(current_device);
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index a3a384e..4f7ab49 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -1179,7 +1179,7 @@ int CEventFinderMenu::showMenu(void)
 	
 	CMenuForwarder* mf0 		= new CMenuForwarder(LOCALE_EVENTFINDER_KEYWORD, true, *m_search_keyword, &stringInput, NULL, CRCInput::RC_1, NEUTRINO_ICON_BUTTON_1);
 	CMenuOptionChooser* mo0 	= new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST, m_search_list, SEARCH_LIST_OPTIONS, SEARCH_LIST_OPTION_COUNT, true, this, CRCInput::RC_2, NEUTRINO_ICON_BUTTON_2);
-	m_search_channelname_mf		= new CMenuForwarderNonLocalized("", *m_search_list != EventList::SEARCH_LIST_ALL, m_search_channelname, this, "3", CRCInput::RC_3, NEUTRINO_ICON_BUTTON_3);
+	m_search_channelname_mf		= new CMenuForwarder("", *m_search_list != EventList::SEARCH_LIST_ALL, m_search_channelname, this, "3", CRCInput::RC_3, NEUTRINO_ICON_BUTTON_3);
 	CMenuOptionChooser* mo1 	= new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_EPG, m_search_epg_item, SEARCH_EPG_OPTIONS, SEARCH_EPG_OPTION_COUNT, true, NULL, CRCInput::RC_4, NEUTRINO_ICON_BUTTON_4);
 	CMenuForwarder* mf1	= new CMenuForwarder(LOCALE_EVENTFINDER_START_SEARCH, true, NULL, this, "5", CRCInput::RC_5, NEUTRINO_ICON_BUTTON_5);
 	
diff --git a/tuxbox/neutrino/src/gui/eventlist.h b/tuxbox/neutrino/src/gui/eventlist.h
index d9b4f89..c892eb8 100644
--- a/tuxbox/neutrino/src/gui/eventlist.h
+++ b/tuxbox/neutrino/src/gui/eventlist.h
@@ -157,7 +157,7 @@ class CEventListHandler : public CMenuTarget
 class CEventFinderMenu : public CMenuTarget, CChangeObserver
 {
 	private:
-		CMenuForwarderNonLocalized* m_search_channelname_mf;
+		CMenuForwarder* m_search_channelname_mf;
 
 		int* 		m_event;
 		int*		m_search_epg_item;
diff --git a/tuxbox/neutrino/src/gui/experimental_menu.cpp b/tuxbox/neutrino/src/gui/experimental_menu.cpp
index 864cc31..54108cd 100644
--- a/tuxbox/neutrino/src/gui/experimental_menu.cpp
+++ b/tuxbox/neutrino/src/gui/experimental_menu.cpp
@@ -65,7 +65,7 @@ int CExperimentalSettingsMenuHandler::doMenu ()
 
 	// the following to lines are examples
 	//ExperimentalSettings.addItem( new CMenuOptionNumberChooser(NONEXISTANT_LOCALE, (int*) &g_settings.show_ca_status, true, 0, 1, 0, 0, LOCALE_OPTIONS_OFF, "show CA Status"));
-	//ExperimentalSettings.addItem(new CMenuForwarderNonLocalized("experimental1", true, NULL, new					CChMosaicHandler(), id, CRCInput::RC_nokey, ""), false);
+	//ExperimentalSettings.addItem(new CMenuForwarder("experimental1", true, NULL, new CChMosaicHandler(), id, CRCInput::RC_nokey, ""), false);
 	
 	
 	return ExperimentalSettings.exec(NULL, "");
diff --git a/tuxbox/neutrino/src/gui/moviebrowser.cpp b/tuxbox/neutrino/src/gui/moviebrowser.cpp
index 3ec0763..2eaf4f4 100644
--- a/tuxbox/neutrino/src/gui/moviebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/moviebrowser.cpp
@@ -2941,7 +2941,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
 	CIntInput*          pBookPosIntInput[MAX_NUMBER_OF_BOOKMARK_ITEMS];
 	CIntInput*	    pBookTypeIntInput[MAX_NUMBER_OF_BOOKMARK_ITEMS];
 	CMenuWidget*        pBookItemMenu[MAX_NUMBER_OF_BOOKMARK_ITEMS];
-	CMenuForwarderNonLocalized* pBookItemMenuForwarder[MAX_NUMBER_OF_BOOKMARK_ITEMS];
+	CMenuForwarder* pBookItemMenuForwarder[MAX_NUMBER_OF_BOOKMARK_ITEMS];
 	CBookItemMenuForwarderNotifier* pBookItemMenuForwarderNotifier[MAX_NUMBER_OF_BOOKMARK_ITEMS];
 
 	CIntInput bookStartIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&)movie_info->bookmarks.start,        5, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
@@ -2971,7 +2971,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
 		pBookItemMenu[i]->addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_POSITION, true,  pBookPosIntInput[i]->getValue(), pBookPosIntInput[i]));
 		pBookItemMenu[i]->addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_TYPE,     true,  pBookTypeIntInput[i]->getValue(),pBookTypeIntInput[i]));
 
-		pBookItemMenuForwarder[i] = new CMenuForwarderNonLocalized(movie_info->bookmarks.user[i].name.c_str(), true, pBookPosIntInput[i]->getValue(), pBookItemMenu[i]);
+		pBookItemMenuForwarder[i] = new CMenuForwarder(movie_info->bookmarks.user[i].name.c_str(), true, pBookPosIntInput[i]->getValue(), pBookItemMenu[i]);
 		pBookItemMenuForwarderNotifier[i]->setItem(pBookItemMenuForwarder[i]);
 
 		bookmarkMenu.addItem(pBookItemMenuForwarder[i]);
@@ -3194,7 +3194,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /*movie_info*/)
 #endif
 #ifdef MOVEMANAGER
 	mainMenu.addItem(GenericMenuSeparatorLine);
-	mainMenu.addItem( new CMenuForwarderNonLocalized("Kopierwerk",        true, NULL,  CMoveManager::getInstance(),   NULL));
+	mainMenu.addItem( new CMenuForwarder("Kopierwerk",        true, NULL,  CMoveManager::getInstance(),   NULL));
 #endif // MOVEMANAGER
 	mainMenu.addItem(GenericMenuSeparatorLine);
 	mainMenu.addItem( new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_HELP_HEAD,        true, NULL, movieHelp,   NULL,                                  CRCInput::RC_help,   NEUTRINO_ICON_BUTTON_HELP));
@@ -3316,7 +3316,7 @@ int CMovieBrowser::showStartPosSelectionMenu(void) // P2
 				
 			snprintf(book[i], 19,"%5d min",position[menu_nr]/60);
 			sprintf(menu_nr_str, "%d", menu_nr);
-			startPosItem = new CMenuForwarderNonLocalized(m_movieSelectionHandler->bookmarks.user[i].name.c_str(), true, book[i], &startPosChanger, menu_nr_str);
+			startPosItem = new CMenuForwarder(m_movieSelectionHandler->bookmarks.user[i].name.c_str(), true, book[i], &startPosChanger, menu_nr_str);
 			startPosItem->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 			startPosSelectionMenu.addItem(startPosItem);
 			menu_nr++;
@@ -3628,12 +3628,12 @@ void CMovieBrowser::autoFindSerie(void)
 
 ************************************************************************/
 
-CBookItemMenuForwarderNotifier::CBookItemMenuForwarderNotifier(CMenuForwarderNonLocalized* MenuForwarder)
+CBookItemMenuForwarderNotifier::CBookItemMenuForwarderNotifier(CMenuForwarder* MenuForwarder)
 {
 	menuForwarder = MenuForwarder;
 }
 
-void CBookItemMenuForwarderNotifier::setItem(CMenuForwarderNonLocalized* MenuForwarder)
+void CBookItemMenuForwarderNotifier::setItem(CMenuForwarder* MenuForwarder)
 {
 	menuForwarder = MenuForwarder;
 }
@@ -3942,7 +3942,7 @@ int CDirMenu::show(void)
 	{
 		sprintf(tmp,"%d",i);
 		tmp[1]=0;
-		CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized((*dirList)[i].name.c_str(), (dirState[i] != DIR_STATE_UNKNOWN), dirOptionText[i], this, tmp);
+		CMenuForwarder* fw = new CMenuForwarder((*dirList)[i].name.c_str(), (dirState[i] != DIR_STATE_UNKNOWN), dirOptionText[i], this, tmp);
 		fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 		dirMenu.addItem(fw, i == 0);
 	}
diff --git a/tuxbox/neutrino/src/gui/moviebrowser.h b/tuxbox/neutrino/src/gui/moviebrowser.h
index 44e9893..658622f 100644
--- a/tuxbox/neutrino/src/gui/moviebrowser.h
+++ b/tuxbox/neutrino/src/gui/moviebrowser.h
@@ -386,10 +386,10 @@ class CMovieBrowser : public CMenuTarget
 class CBookItemMenuForwarderNotifier : public CChangeObserver
 {
 	private:
-		CMenuForwarderNonLocalized* menuForwarder;
+		CMenuForwarder* menuForwarder;
 	public:
-		CBookItemMenuForwarderNotifier(CMenuForwarderNonLocalized* MenuForwarder = NULL);
-		void setItem(CMenuForwarderNonLocalized* MenuForwarder);
+		CBookItemMenuForwarderNotifier(CMenuForwarder* MenuForwarder = NULL);
+		void setItem(CMenuForwarder* MenuForwarder);
 		bool changeNotify(const neutrino_locale_t, void* Data);
 };
 
diff --git a/tuxbox/neutrino/src/gui/movieplayer.cpp b/tuxbox/neutrino/src/gui/movieplayer.cpp
index c9cd0b2..4a621a8 100644
--- a/tuxbox/neutrino/src/gui/movieplayer.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer.cpp
@@ -3607,7 +3607,7 @@ void CMoviePlayerGui::PlayFile (int parental)
 				std::ostringstream actionKey;
 				actionKey << "AUD: " << count;
 
-				CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(apidtitle.c_str(),
+				CMenuForwarder* fw = new CMenuForwarder(apidtitle.c_str(),
 						true, NULL, APIDChanger, actionKey.str().c_str(),
 						CRCInput::convertDigitToKey(++digit));
 				fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
@@ -3632,7 +3632,7 @@ void CMoviePlayerGui::PlayFile (int parental)
 				std::ostringstream actionKey;
 				actionKey << "AUD: " << count;
 
-				CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(apidtitle.c_str(),
+				CMenuForwarder* fw = new CMenuForwarder(apidtitle.c_str(),
 						true, NULL, APIDChanger, actionKey.str().c_str(),
 						CRCInput::convertDigitToKey(++digit));
 				fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
@@ -3671,7 +3671,7 @@ void CMoviePlayerGui::PlayFile (int parental)
 						std::ostringstream actionKey;
 						actionKey << "TTX: " << p_movie_info->subPids[i].subPage;
 
-						CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(apidtitle.c_str(),
+						CMenuForwarder* fw = new CMenuForwarder(apidtitle.c_str(),
 								hasTuxtxtPlugin, NULL, APIDChanger, actionKey.str().c_str(),
 								CRCInput::convertDigitToKey(++digit));
 						fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
@@ -3706,7 +3706,7 @@ void CMoviePlayerGui::PlayFile (int parental)
 				std::ostringstream actionKey;
 				actionKey << "DVB: " << subpid;
 
-				CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(apidtitle.c_str(),
+				CMenuForwarder* fw = new CMenuForwarder(apidtitle.c_str(),
 						hasDvbsubPlugin, NULL, APIDChanger, actionKey.str().c_str(),
 						CRCInput::convertDigitToKey(++digit));
 				fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
diff --git a/tuxbox/neutrino/src/gui/movieplayer2.cpp b/tuxbox/neutrino/src/gui/movieplayer2.cpp
index a6ab3c0..b723969 100644
--- a/tuxbox/neutrino/src/gui/movieplayer2.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer2.cpp
@@ -3101,7 +3101,7 @@ CMoviePlayerGui::PlayStream(int streamtype)
 				std::ostringstream actionKey;
 				actionKey << "AUD: " << count;
 
-				CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(apidtitle.c_str(),
+				CMenuForwarder* fw = new CMenuForwarder(apidtitle.c_str(),
 						true, NULL, APIDChanger, actionKey.str().c_str(),
 						CRCInput::convertDigitToKey(++digit));
 				fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
@@ -3148,7 +3148,7 @@ CMoviePlayerGui::PlayStream(int streamtype)
 				std::ostringstream actionKey;
 				actionKey << "AUD: " << count;
 
-				CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(apidtitle.c_str(),
+				CMenuForwarder* fw = new CMenuForwarder(apidtitle.c_str(),
 						true, NULL, APIDChanger, actionKey.str().c_str(),
 						CRCInput::convertDigitToKey(++digit));
 				fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
@@ -3187,7 +3187,7 @@ CMoviePlayerGui::PlayStream(int streamtype)
 						std::ostringstream actionKey;
 						actionKey << "TTX: " << movieinfo.subPids[i].subPage;
 
-						CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(apidtitle.c_str(),
+						CMenuForwarder* fw = new CMenuForwarder(apidtitle.c_str(),
 								hasTuxtxtPlugin, NULL, APIDChanger, actionKey.str().c_str(),
 								CRCInput::convertDigitToKey(++digit));
 						fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
@@ -3236,7 +3236,7 @@ CMoviePlayerGui::PlayStream(int streamtype)
 				std::ostringstream actionKey;
 				actionKey << "DVB: " << subpid;
 
-				CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(apidtitle.c_str(),
+				CMenuForwarder* fw = new CMenuForwarder(apidtitle.c_str(),
 						hasDvbsubPlugin, NULL, APIDChanger, actionKey.str().c_str(),
 						CRCInput::convertDigitToKey(++digit));
 				fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
diff --git a/tuxbox/neutrino/src/gui/movieplayer_setup.cpp b/tuxbox/neutrino/src/gui/movieplayer_setup.cpp
index 5e00021..58a951a 100644
--- a/tuxbox/neutrino/src/gui/movieplayer_setup.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer_setup.cpp
@@ -271,7 +271,7 @@ int CMoviePlayerSetup::showMoviePlayerSelectPlugin()
 			sprintf(id, "%d", count);
 			enabled_count++;
 
-			CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(pluginName.c_str(),
+			CMenuForwarder* fw = new CMenuForwarder(pluginName.c_str(),
 				true, NULL, this, id, CRCInput::convertDigitToKey(enabled_count));
 			fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 
diff --git a/tuxbox/neutrino/src/gui/neutrino_menu.cpp b/tuxbox/neutrino/src/gui/neutrino_menu.cpp
index 465e61d..e5fcfae 100644
--- a/tuxbox/neutrino/src/gui/neutrino_menu.cpp
+++ b/tuxbox/neutrino/src/gui/neutrino_menu.cpp
@@ -467,7 +467,7 @@ bool CNeutrinoApp::showUserMenu(int button)
 						if (StreamFeaturesChanger == NULL)
 							StreamFeaturesChanger = new CStreamFeaturesChangeExec();
 						keyhelper.get(&key, &icon, cnt == 0 ? CRCInput::RC_blue : CRCInput::RC_nokey);
-						menu_item = new CMenuForwarderNonLocalized(g_PluginList->getName(count), true, NULL, StreamFeaturesChanger, id, key, icon);
+						menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, StreamFeaturesChanger, id, key, icon);
 						menu->addItem(menu_item, (cnt == 0));
 						cnt++;
 					}
@@ -486,7 +486,7 @@ bool CNeutrinoApp::showUserMenu(int button)
 						if (StreamFeaturesChanger == NULL)
 							StreamFeaturesChanger = new CStreamFeaturesChangeExec();
 						keyhelper.get(&key, &icon, cnt == 0 ? CRCInput::RC_blue : CRCInput::RC_nokey);
-						menu_item = new CMenuForwarderNonLocalized(g_PluginList->getName(count), true, NULL, StreamFeaturesChanger, id, key, icon);
+						menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, StreamFeaturesChanger, id, key, icon);
 						menu->addItem(menu_item, (cnt == 0));
 						cnt++;
 					}
diff --git a/tuxbox/neutrino/src/gui/nfs.cpp b/tuxbox/neutrino/src/gui/nfs.cpp
index bf02791..ef978c8 100644
--- a/tuxbox/neutrino/src/gui/nfs.cpp
+++ b/tuxbox/neutrino/src/gui/nfs.cpp
@@ -162,7 +162,7 @@ int CNFSMountGui::menu()
 	{
 		sprintf(s2,"mountentry%d",i);
 		sprintf(ISO_8859_1_entry[i],ZapitTools::UTF8_to_Latin1(m_entry[i]).c_str());
-		mountMenuEntry[i] = new CMenuForwarderNonLocalized("", true, ISO_8859_1_entry[i], this, s2);
+		mountMenuEntry[i] = new CMenuForwarder("", true, ISO_8859_1_entry[i], this, s2);
 		if (CFSMounter::isMounted(g_settings.network_nfs_local_dir[i]))
 			mountMenuEntry[i]->iconName = NEUTRINO_ICON_MOUNTED;
 		else
@@ -304,7 +304,7 @@ int CNFSUmountGui::menu()
 			s1 += it->mountPoint;
 			std::string s2 = "doumount ";
 			s2 += it->mountPoint;
-			CMenuForwarder *forwarder = new CMenuForwarderNonLocalized(s1.c_str(), true, NULL, this, s2.c_str());
+			CMenuForwarder *forwarder = new CMenuForwarder(s1.c_str(), true, NULL, this, s2.c_str());
 			forwarder->iconName = NEUTRINO_ICON_MOUNTED;
 			umountMenu.addItem(forwarder);
 		}
diff --git a/tuxbox/neutrino/src/gui/nfs.h b/tuxbox/neutrino/src/gui/nfs.h
index 0a9932a..ea2c343 100644
--- a/tuxbox/neutrino/src/gui/nfs.h
+++ b/tuxbox/neutrino/src/gui/nfs.h
@@ -48,7 +48,7 @@ class CNFSMountGui : public CMenuTarget
 	char       m_entry[NETWORK_NFS_NR_OF_ENTRIES][200];
 	char       ISO_8859_1_entry[NETWORK_NFS_NR_OF_ENTRIES][200];
 
-	CMenuForwarderNonLocalized* mountMenuEntry[NETWORK_NFS_NR_OF_ENTRIES];
+	CMenuForwarder* mountMenuEntry[NETWORK_NFS_NR_OF_ENTRIES];
 
 	CFSMounter::FS_Support m_nfs_sup;
 	CFSMounter::FS_Support m_cifs_sup;
diff --git a/tuxbox/neutrino/src/gui/osdlang_setup.cpp b/tuxbox/neutrino/src/gui/osdlang_setup.cpp
index faaed36..cec7552 100644
--- a/tuxbox/neutrino/src/gui/osdlang_setup.cpp
+++ b/tuxbox/neutrino/src/gui/osdlang_setup.cpp
@@ -125,7 +125,7 @@ int COsdLangSetup::showSetup()
 				if(pos != NULL)
 				{
 					*pos = '\0';
-					CMenuForwarderNonLocalized* oj = new CMenuForwarderNonLocalized(locale, true, "", this, locale);
+					CMenuForwarder* oj = new CMenuForwarder(locale, true, "", this, locale);
 					oj->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 					osdl_setup->addItem(oj, strcmp(g_settings.language, locale) == 0);
 				}
diff --git a/tuxbox/neutrino/src/gui/personalize.cpp b/tuxbox/neutrino/src/gui/personalize.cpp
index 72912c5..6e0372e 100644
--- a/tuxbox/neutrino/src/gui/personalize.cpp
+++ b/tuxbox/neutrino/src/gui/personalize.cpp
@@ -271,7 +271,7 @@ int CPersonalizeGui::ShowPersonalizationMenu()
 	pMenu->addItem(new CMenuForwarder(LOCALE_PERSONALIZE_PINCODE, true, g_settings.personalize_pincode, &pinChangeWidget));
 	pMenu->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_PERSONALIZE_ACCESS));
 	
-	CMenuForwarderNonLocalized *p_mn[widget_count];
+	CMenuForwarder *p_mn[widget_count];
 	string mn_name;
 	
  	for (int i = 0; i<(widget_count); i++)
@@ -281,7 +281,7 @@ int CPersonalizeGui::ShowPersonalizationMenu()
 		string s(i_str.str());
 		string action_key = s;
 		mn_name = v_widget[i]->getName();
-		p_mn[i] = new CMenuForwarderNonLocalized(mn_name.c_str(), true, NULL, this, action_key.c_str(), CRCInput::convertDigitToKey(i+1));
+		p_mn[i] = new CMenuForwarder(mn_name.c_str(), true, NULL, this, action_key.c_str(), CRCInput::convertDigitToKey(i+1));
  		pMenu->addItem(p_mn[i]);
 	}
 
diff --git a/tuxbox/neutrino/src/gui/record_setup.cpp b/tuxbox/neutrino/src/gui/record_setup.cpp
index 2344932..1c7a25b 100644
--- a/tuxbox/neutrino/src/gui/record_setup.cpp
+++ b/tuxbox/neutrino/src/gui/record_setup.cpp
@@ -233,7 +233,7 @@ int CRecordSetup::showRecordSetup()
 		temp[9] = 0; // terminate for sure
 		CMenuWidget* dirRecordingSettings = new CMenuWidget(LOCALE_RECORDINGMENU_FILESETTINGS, NEUTRINO_ICON_RECORDING, width);
 		toDelete.push_back(dirRecordingSettings);
-		dirMenu->addItem(new CMenuForwarderNonLocalized(temp, true, g_settings.recording_dir[i], dirRecordingSettings));
+		dirMenu->addItem(new CMenuForwarder(temp, true, g_settings.recording_dir[i], dirRecordingSettings));
 
 		// subhead
 		snprintf(temp, 10, " %d", i + 1);
diff --git a/tuxbox/neutrino/src/gui/subchannel_select.cpp b/tuxbox/neutrino/src/gui/subchannel_select.cpp
index cc83711..b39af9d 100644
--- a/tuxbox/neutrino/src/gui/subchannel_select.cpp
+++ b/tuxbox/neutrino/src/gui/subchannel_select.cpp
@@ -101,14 +101,14 @@ int CSubChannelSelectMenu::doMenu()
 				nvod_time_x[0] = 0;
 
 			sprintf(nvod_s, "%s - %s %s", nvod_time_a, nvod_time_e, nvod_time_x);
-			SubChannelSelector.addItem(new CMenuForwarderNonLocalized(nvod_s, true, NULL, this, nvod_id), count == g_RemoteControl->selected_subchannel);
+			SubChannelSelector.addItem(new CMenuForwarder(nvod_s, true, NULL, this, nvod_id), count == g_RemoteControl->selected_subchannel);
 		}
 		else
 		{
 			if (count == 0)
-				SubChannelSelector.addItem(new CMenuForwarderNonLocalized(Latin1_to_UTF8(e->subservice_name).c_str(), true, NULL, this, nvod_id, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
+				SubChannelSelector.addItem(new CMenuForwarder(Latin1_to_UTF8(e->subservice_name).c_str(), true, NULL, this, nvod_id, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
 			else
-				SubChannelSelector.addItem(new CMenuForwarderNonLocalized(Latin1_to_UTF8(e->subservice_name).c_str(), true, NULL, this, nvod_id, CRCInput::convertDigitToKey(count)), count == g_RemoteControl->selected_subchannel);
+				SubChannelSelector.addItem(new CMenuForwarder(Latin1_to_UTF8(e->subservice_name).c_str(), true, NULL, this, nvod_id, CRCInput::convertDigitToKey(count)), count == g_RemoteControl->selected_subchannel);
 		}
 
 		count++;
diff --git a/tuxbox/neutrino/src/gui/themes.cpp b/tuxbox/neutrino/src/gui/themes.cpp
index 327f1fe..4981d07 100644
--- a/tuxbox/neutrino/src/gui/themes.cpp
+++ b/tuxbox/neutrino/src/gui/themes.cpp
@@ -135,9 +135,9 @@ void CThemes::readThemes(CMenuWidget &themes)
 					*pos = '\0';
 					if ( p == 1 ) {
 						userThemeFile = "{U}" + (std::string)file;
-						oj = new CMenuForwarderNonLocalized(file, true, "", this, userThemeFile.c_str());
+						oj = new CMenuForwarder(file, true, "", this, userThemeFile.c_str());
 					} else
-						oj = new CMenuForwarderNonLocalized(file, true, "", this, file);
+						oj = new CMenuForwarder(file, true, "", this, file);
 					oj->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 					themes.addItem( oj );
 				}
diff --git a/tuxbox/neutrino/src/gui/timerlist.cpp b/tuxbox/neutrino/src/gui/timerlist.cpp
index 4b42791..62938a3 100644
--- a/tuxbox/neutrino/src/gui/timerlist.cpp
+++ b/tuxbox/neutrino/src/gui/timerlist.cpp
@@ -1078,12 +1078,12 @@ int CTimerList::newTimer()
 				PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
 				",",
 				channel->channel_id);
-			CMenuForwarderNonLocalized *tv_ch_item = new CMenuForwarderNonLocalized(channel->name, true, NULL, this, (std::string(cChannelId) + channel->name).c_str());
+			CMenuForwarder *tv_ch_item = new CMenuForwarder(channel->name, true, NULL, this, (std::string(cChannelId) + channel->name).c_str());
 			tv_ch_item->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 			mwtv->addItem(tv_ch_item);	
 		}
 		if (!subchannellist.empty())
-			mctv.addItem(new CMenuForwarderNonLocalized(bouquet->name, true, NULL, mwtv));
+			mctv.addItem(new CMenuForwarder(bouquet->name, true, NULL, mwtv));
 		subchannellist.clear();
 
 		//radio
@@ -1098,12 +1098,12 @@ int CTimerList::newTimer()
 				PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
 				",",
 				channel->channel_id);
-			CMenuForwarderNonLocalized *radio_ch_item = new CMenuForwarderNonLocalized(channel->name, true, NULL, this, (std::string(cChannelId) + channel->name).c_str());
+			CMenuForwarder *radio_ch_item = new CMenuForwarder(channel->name, true, NULL, this, (std::string(cChannelId) + channel->name).c_str());
 			radio_ch_item->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 			mwradio->addItem(radio_ch_item);
 		}
 		if (!subchannellist.empty())
-			mcradio.addItem(new CMenuForwarderNonLocalized(bouquet->name, true, NULL, mwradio));
+			mcradio.addItem(new CMenuForwarder(bouquet->name, true, NULL, mwradio));
 	}
 	//selct mode (tv/radio)
 	CMenuWidget mm(LOCALE_TIMERLIST_MODESELECT, NEUTRINO_ICON_TIMER, width);
diff --git a/tuxbox/neutrino/src/gui/update.cpp b/tuxbox/neutrino/src/gui/update.cpp
index 0acd9f5..5b2f934 100644
--- a/tuxbox/neutrino/src/gui/update.cpp
+++ b/tuxbox/neutrino/src/gui/update.cpp
@@ -201,7 +201,7 @@ bool CFlashUpdate::selectHttpImage(void)
 				descriptions.push_back(description); /* workaround since CMenuForwarder does not store the Option String itself */
 
 				update_menu_targets.push_back(new CUpdateMenuTarget(i, &selected));
-				CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(names[i].c_str(), true, descriptions[i].c_str(), update_menu_targets.back());
+				CMenuForwarder* fw = new CMenuForwarder(names[i].c_str(), true, descriptions[i].c_str(), update_menu_targets.back());
 				fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 				SelectionWidget.addItem(fw);
 				i++;
@@ -686,7 +686,7 @@ int CFlashExpert::showMTDSelector(const std::string & actionkey)
 	{
 		char sActionKey[20];
 		sprintf(sActionKey, "%s%d", actionkey.c_str(), i);
-		mtdselector->addItem(new CMenuForwarderNonLocalized(mtdInfo->getMTDName(i).c_str(), true, NULL, this, sActionKey, CRCInput::convertDigitToKey(i+1)));
+		mtdselector->addItem(new CMenuForwarder(mtdInfo->getMTDName(i).c_str(), true, NULL, this, sActionKey, CRCInput::convertDigitToKey(i+1)));
 	}
 	int res = mtdselector->exec(NULL,"");
 	delete mtdselector;
@@ -715,7 +715,7 @@ int CFlashExpert::showFileSelector(const std::string & actionkey)
 			   || (int(filen.find(".flfs")) != -1)
 			   )
 			{
-				CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(filen.c_str(), true, NULL, this, (actionkey + filen).c_str());
+				CMenuForwarder* fw = new CMenuForwarder(filen.c_str(), true, NULL, this, (actionkey + filen).c_str());
 				fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 				fileselector->addItem(fw);
 #warning TODO: make sure filen is UTF-8 encoded
diff --git a/tuxbox/neutrino/src/gui/widget/dirchooser.cpp b/tuxbox/neutrino/src/gui/widget/dirchooser.cpp
index d7ee98e..50a8c65 100755
--- a/tuxbox/neutrino/src/gui/widget/dirchooser.cpp
+++ b/tuxbox/neutrino/src/gui/widget/dirchooser.cpp
@@ -195,7 +195,7 @@ void CRecDirChooser::initMenu(void)
 				dirOptionText[i]=tmp;
 			}
 			snprintf(indexStr,10,"MID:%d",i);
-			CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(g_settings.recording_dir[i].c_str(), true, dirOptionText[i], this, indexStr);
+			CMenuForwarder* fw = new CMenuForwarder(g_settings.recording_dir[i].c_str(), true, dirOptionText[i], this, indexStr);
 			fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 			addItem(fw, i == 0); // select first item
 		}
diff --git a/tuxbox/neutrino/src/gui/widget/menue.cpp b/tuxbox/neutrino/src/gui/widget/menue.cpp
index 5fa3cbc..672603c 100644
--- a/tuxbox/neutrino/src/gui/widget/menue.cpp
+++ b/tuxbox/neutrino/src/gui/widget/menue.cpp
@@ -981,7 +981,7 @@ int CMenuOptionStringChooser::exec(CMenuTarget* parent)
 			if (strcmp(options[count].c_str(), optionValue) == 0)
 				selected = true;
 			sprintf(cnt, "%d", count);
-			CMenuForwarderNonLocalized *mn_option = new CMenuForwarderNonLocalized(options[count].c_str(), true, NULL, selector, cnt);
+			CMenuForwarder *mn_option = new CMenuForwarder(options[count].c_str(), true, NULL, selector, cnt);
 			mn_option->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true /*for selected item*/);
 			menu->addItem(mn_option, selected);
 		}
@@ -1063,6 +1063,32 @@ CMenuForwarder::CMenuForwarder(const neutrino_locale_t Text, const bool Active,
 	iconName = IconName ? IconName : "";
 }
 
+CMenuForwarder::CMenuForwarder(const char * const Text, const bool Active, const char * const Option, CMenuTarget* Target, const char * const ActionKey, neutrino_msg_t DirectKey, const char * const IconName)
+{
+	option = Option;
+	option_string = NULL;
+	text = NONEXISTANT_LOCALE;
+	the_text = Text;
+	active = Active;
+	jumpTarget = Target;
+	actionKey = ActionKey ? ActionKey : "";
+	directKey = DirectKey;
+	iconName = IconName ? IconName : "";
+}
+
+CMenuForwarder::CMenuForwarder(const char * cons...
 
[truncated message content]