Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++

data/locale/Makefile.am

@@ -21,28 +21,34 @@ install_DATA = \
 
 if MAINTAINER_MODE
 
-locals: locals.h locals_intern.h
+locals: sort-locals locals.h locals_intern.h install-locals
 
-ordercheck: deutsch.locale
+sort-locals: $(top_srcdir)/data/locale/deutsch.locale $(top_srcdir)/data/locale/english.locale
-	cut -d' ' -f1 deutsch.locale | LC_ALL=C sort | uniq > /tmp/log
+	cat $(top_srcdir)/data/locale/deutsch.locale | LC_ALL=C sort | uniq > deutsch.locale
-	cut -d' ' -f1 deutsch.locale | uniq  | diff - /tmp/log || \
+	cat $(top_srcdir)/data/locale/english.locale | LC_ALL=C sort | uniq > english.locale
+
+ordercheck: $(top_srcdir)/data/locale/deutsch.locale
+	cut -d' ' -f1 $(top_srcdir)/data/locale/deutsch.locale | LC_ALL=C sort | uniq > /tmp/log
+	cut -d' ' -f1 $(top_srcdir)/data/locale/deutsch.locale | uniq  | diff - /tmp/log || \
 		(echo "ERROR: deutsch.locale not ordered or contains empty lines" && false)
 
-locals.h: ordercheck deutsch.locale
+locals.h: ordercheck $(top_srcdir)/data/locale/deutsch.locale
-	cut -d' ' -f1 deutsch.locale | LC_ALL=C sort | uniq | tr [:lower:] [:upper:] | tr \. \_  | tr \- \_ | tr -d \? | ./create.locals.h
+	cut -d' ' -f1 $(top_srcdir)/data/locale/deutsch.locale | LC_ALL=C sort | uniq | tr [:lower:] [:upper:] | tr \. \_  | tr \- \_ | tr -d \? | $(top_srcdir)/data/locale/create.locals.h
 
-locals_intern.h: ordercheck deutsch.locale
+locals_intern.h: ordercheck $(top_srcdir)/data/locale/deutsch.locale
-	cut -d' ' -f1 deutsch.locale | LC_ALL=C sort | uniq | ./create.locals_intern.h
+	cut -d' ' -f1 $(top_srcdir)/data/locale/deutsch.locale | LC_ALL=C sort | uniq | $(top_srcdir)/data/locale/create.locals_intern.h
 
 check: locals.h locals_intern.h
-	diff locals.h ../../src/system
+	diff locals.h $(top_srcdir)/src/system
-	diff locals_intern.h ../../src/system
+	diff locals_intern.h $(top_srcdir)/src/system
 
 install-locals: locals.h locals_intern.h
-	cp locals.h locals_intern.h ../../src/system
+	cp locals.h locals_intern.h $(top_srcdir)/src/system
-	@echo "Consider committing .../neutrino/src/system/[locals.h,locals_intern.h]"
+	@echo "Consider committing src/system/[locals.h,locals_intern.h]"
+	cp -f deutsch.locale english.locale $(top_srcdir)/data/locale
+	@echo "Consider committing data/locale/[deutsch.locale,english.locale]"
 
 locals-clean:
-	rm -f locals.h locals_intern.h
+	rm -f locals.h locals_intern.h deutsch.locale english.locale
 
 endif

data/locale/_readme.txt

@@ -28,36 +28,35 @@ How do I add a new locale string?
 ---------------------------------
 1.)
 First of all, add the new string to deutsch.locale while preserving
-the ordering. Do not add any empty lines. Use `make ordercheck' to for
+the ordering. Do not add any empty lines.
-verification.
 
 2.)
-Enter the directory apps/tuxbox/neutrino/data/locale.
+Enter the directory build_tmp/neutrino-hd/data/locale.
 
 3.)
-Create new versions of the files apps/tuxbox/neutrino/src/system/locals.h
+Use for sorting (deutsch.locale,english.locale) 'make sort-locals', use 'make ordercheck' to for
-and apps/tuxbox/neutrino/src/system/locals_intern.h
+verification.
-using the command `make locals.h locals_intern.h'.
 
 4.)
-Check the modifications with `make check', or with
+Create new versions of the files src/system/locals.h and src/system/locals_intern.h
-diff locals.h ../../src/system/locals.h
+using the command 'make locals.h locals_intern.h'.
-diff locals_intern.h ../../src/system/locals_intern.h
 
 5.)
-Copy the replacement file to their destination with `make install-locals',
+Check the modifications with 'make check'
-or with
-cp -p locals.h ../../src/system/locals.h
-cp -p locals_intern.h ../../src/system/locals_intern.h
 
 6.)
+Copy the replacement file to their destination with 'make install-locals'
+
+7.)
+Or use for item 3-6 'make locals'
+
+8.)
 To the extent possible, update other locale file. For this, the
 Perl-script create-locals-update.pl may be useful. 
 
-7.)
+9.)
-If committing the changes to CVS, commit both the involved
+If committing the changes to Git, commit both the involved
-locale-files, apps/tuxbox/neutrino/src/system/locals.h, and
+locale-files, src/system/locals.h, and src/system/locals_intern.h.
-as apps/tuxbox/neutrino/src/system/locals_intern.h.
 
 Useful tools:
 -------------

data/locale/deutsch.locale

@@ -299,6 +299,7 @@ epgextended.presenter Moderator
 epgextended.year_of_production Produktionsjahr
 epglist.noevents Keine EPG-Information verfügbar.
 epgviewer.More_Screenings Weitere Termine auf diesem Kanal
+epgviewer.More_Screenings_short Weitere Termine
 epgviewer.nodetailed Keine ausführlichen Informationen verfügbar
 epgviewer.notfound Keine Programminformationen (EPG) gefunden
 eventfinder.head EPG-Suche

src/gui/epgview.cpp

@@ -592,10 +592,12 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 
 	// -- display more screenings on the same channel
 	// -- 2002-05-03 rasc
+	has_follow_screenings = false;
 	if (hasFollowScreenings(channel_id, epgData.title)) {
 		processTextToArray(""); // UTF-8
 		processTextToArray(std::string(g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS)) + ':'); // UTF-8
 		FollowScreenings(channel_id, epgData.title);
+		has_follow_screenings = true;
 	}
 
 	COSDFader fader(g_settings.menu_Content_alpha);
@@ -847,7 +849,24 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 					printf("timerd not available\n");
 				break;
 			}
+			case CRCInput::RC_blue:
+			{	
+				if(!followlist.empty()){
+					hide();
+					CNeutrinoEventList     *ee;
+					ee = new CNeutrinoEventList;
+					ee->exec(channel_id, g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT),"","",followlist); // UTF-8
+					delete ee;
 
+					if (!bigFonts && g_settings.bigFonts) {
+						g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIG_FONT_FAKTOR));
+						g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIG_FONT_FAKTOR));
+					}
+					bigFonts = g_settings.bigFonts;
+					show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false);
+				}
+				break;
+			}
 			case CRCInput::RC_info:
 			case CRCInput::RC_help:
 				bigFonts = bigFonts ? false : true;
@@ -1072,7 +1091,9 @@ int CEpgData::FollowScreenings (const t_channel_id /*channel_id*/, const std::st
 const struct button_label EpgButtons[] =
 {
 	{ NEUTRINO_ICON_BUTTON_RED   , LOCALE_TIMERBAR_RECORDEVENT },
-	{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_TIMERBAR_CHANNELSWITCH }
+	{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_TIMERBAR_CHANNELSWITCH },
+	{ NEUTRINO_ICON_BUTTON_BLUE, LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT }
+
 };
 
 void CEpgData::showTimerEventBar (bool pshow)
@@ -1097,9 +1118,9 @@ void CEpgData::showTimerEventBar (bool pshow)
 	frameBuffer->paintBoxRel(sx,y,ox,h, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_LARGE, CORNER_BOTTOM);//round
 
 	if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF)
-		::paintButtons(x, y, 0, 2, EpgButtons, h);
+		::paintButtons(x, y, 0, has_follow_screenings ? 3:2, EpgButtons, h);
 	else
-		::paintButtons(x, y, 0, 1, &EpgButtons[1], h);
+		::paintButtons(x, y, 0, has_follow_screenings ? 2:1, &EpgButtons[1], h);
 
 #if 0
 	// Button: Timer Record & Channelswitch

src/gui/epgview.h

@@ -62,6 +62,7 @@ class CEpgData
 		std::string 		epg_end;
 		int			epg_done;
 		bool			bigFonts;
+		bool 			has_follow_screenings;
 		time_t			tmp_curent_zeit;
 
 		uint64_t		prev_id;

src/gui/eventlist.cpp

@@ -248,12 +248,12 @@ void CNeutrinoEventList::readEvents(const t_channel_id channel_id)
 }
 
 
-int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& channelname, const std::string& channelname_prev, const std::string& channelname_next) // UTF-8
+int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& channelname, const std::string& channelname_prev, const std::string& channelname_next,const CChannelEventList &followlist) // UTF-8
 {
 	neutrino_msg_t      msg;
 	neutrino_msg_data_t data;
 	bool in_search = false;
-
+	showfollow = false;
 	// Calculate iheight
 	struct button_label tmp_button[1] = { { NEUTRINO_ICON_BUTTON_RED, NONEXISTANT_LOCALE } };
 	iheight = ::paintButtons(0, 0, 0, 1, tmp_button, 0, 0, false, COL_INFOBAR_SHADOW, NULL, 0, false);
@@ -300,8 +300,13 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
 
 	COSDFader fader(g_settings.menu_Content_alpha);
 	fader.StartFadeIn();
-
+	if(!followlist.empty()){
-	readEvents(channel_id);
+		insert_iterator <std::vector<CChannelEvent> >ii(evtlist,evtlist.begin());
+		copy(followlist.begin(), followlist.end(), ii);
+		showfollow = true;
+	}else{
+		readEvents(channel_id);
+	}
 	UpdateTimerList();
 
 	if(channelname_prev.empty(), channelname_next.empty()){
@@ -385,7 +390,7 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
 			showFunctionBar(paint_buttonbar, channel_id);
 		}
 		//sort
-		else if (msg == (neutrino_msg_t)g_settings.key_channelList_sort)
+		else if (!showfollow && (msg == (neutrino_msg_t)g_settings.key_channelList_sort))
 		{
 			uint64_t selected_id = evtlist[selected].eventID;
 			if(sort_mode==0)
@@ -635,7 +640,7 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
 				}
 			}
 		}
-		else if ( msg==CRCInput::RC_green )
+		else if (!showfollow  && ( msg==CRCInput::RC_green ))
 		{
 			in_search = findEvents();
 			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
@@ -938,11 +943,12 @@ void  CNeutrinoEventList::showFunctionBar (bool show, t_channel_id channel_id)
 			bx+=w_button+4;
 		}
 	}
-	
-	// Button: Search
-	FunctionBarHeight = std::max(::paintButtons(bx, by, w_button, NUM_EVENTLIST_SECOND_BUTTON, EventListSecondButton), FunctionBarHeight);
-	bx+=w_button+4;
 
+	if(!showfollow){
+		// Button: Search
+		FunctionBarHeight = std::max(::paintButtons(bx, by, w_button, NUM_EVENTLIST_SECOND_BUTTON, EventListSecondButton), FunctionBarHeight);
+		bx+=w_button+4;
+	}
 	// Button: Timer Channelswitch
 	if ((uint) g_settings.key_channelList_addremind != CRCInput::RC_nokey) {
 		if (!g_settings.minimode) {
@@ -961,14 +967,15 @@ void  CNeutrinoEventList::showFunctionBar (bool show, t_channel_id channel_id)
 		FunctionBarHeight = std::max(::paintButtons(bx, by, w_button, NUM_EVENTLIST_THIRD_BUTTON, EventListThirdButton), FunctionBarHeight);
 		bx+=w_button+4;
 	}
-
+	if(!showfollow){
-	// Button: Event Re-Sort
+		// Button: Event Re-Sort
-	if ((uint) g_settings.key_channelList_sort != CRCInput::RC_nokey) {
+		if ((uint) g_settings.key_channelList_sort != CRCInput::RC_nokey) {
-		// FIXME : display other icons depending on g_settings.key_channelList_sort
+			// FIXME : display other icons depending on g_settings.key_channelList_sort
-		keyhelper.get(&dummy, &icon, g_settings.key_channelList_sort);
+			keyhelper.get(&dummy, &icon, g_settings.key_channelList_sort);
-		EventListFourthButton[0].button = icon;
+			EventListFourthButton[0].button = icon;
-		FunctionBarHeight = std::max(::paintButtons(bx, by, w_button, NUM_EVENTLIST_THIRD_BUTTON, EventListFourthButton), FunctionBarHeight);
+			FunctionBarHeight = std::max(::paintButtons(bx, by, w_button, NUM_EVENTLIST_THIRD_BUTTON, EventListFourthButton), FunctionBarHeight);
-// 		bx+=w_button+4;
+// 			bx+=w_button+4;
+		}
 	}
 }
 

src/gui/eventlist.h

@@ -118,13 +118,13 @@ class CNeutrinoEventList
 	int timerPost;
 	void UpdateTimerList(void);
 	bool HasTimerConflicts(time_t starttime, time_t duration, event_id_t * epg_ID);
-	
+	bool showfollow;
 	CTimerd::CTimerEventTypes isScheduled(t_channel_id channel_id, CChannelEvent * event, int * tID = NULL);
 	
 	public:
 		CNeutrinoEventList();
 		~CNeutrinoEventList();
-		int exec(const t_channel_id channel_id, const std::string& channelname, const std::string& prev = "", const std::string&  next = ""); // UTF-8
+		int exec(const t_channel_id channel_id, const std::string& channelname, const std::string& prev = "", const std::string&  next = "", const CChannelEventList &followlist = CChannelEventList ()); // UTF-8
 };
 
 class CEventListHandler : public CMenuTarget

src/system/locals.h

@@ -25,7 +25,112 @@
 typedef enum
 {
 	NONEXISTANT_LOCALE,
+	LOCALE_AUDIOSELECTMENUE_HEAD,
+	LOCALE_EPGMENU_EPGPLUS,
+	LOCALE_EPGMENU_EVENTINFO,
+	LOCALE_EPGMENU_EVENTLIST,
+	LOCALE_EPGMENU_HEAD,
+	LOCALE_EPGMENU_STREAMINFO,
+	LOCALE_EPGPLUS_ACTIONS,
+	LOCALE_EPGPLUS_BYBOUQUET_MODE,
+	LOCALE_EPGPLUS_BYPAGE_MODE,
+	LOCALE_EPGPLUS_HEAD,
+	LOCALE_EPGPLUS_NEXT_BOUQUET,
+	LOCALE_EPGPLUS_OPTIONS,
+	LOCALE_EPGPLUS_PAGE_DOWN,
+	LOCALE_EPGPLUS_PAGE_UP,
+	LOCALE_EPGPLUS_PREV_BOUQUET,
+	LOCALE_EPGPLUS_RECORD,
+	LOCALE_EPGPLUS_REFRESH_EPG,
+	LOCALE_EPGPLUS_REMIND,
+	LOCALE_EPGPLUS_SCROLL_MODE,
+	LOCALE_EPGPLUS_STRETCH_MODE,
+	LOCALE_EPGPLUS_SWAP_MODE,
+	LOCALE_EPGPLUS_VIEW_MODE,
+	LOCALE_GENRE_ARTS_0,
+	LOCALE_GENRE_ARTS_1,
+	LOCALE_GENRE_ARTS_10,
+	LOCALE_GENRE_ARTS_11,
+	LOCALE_GENRE_ARTS_2,
+	LOCALE_GENRE_ARTS_3,
+	LOCALE_GENRE_ARTS_4,
+	LOCALE_GENRE_ARTS_5,
+	LOCALE_GENRE_ARTS_6,
+	LOCALE_GENRE_ARTS_7,
+	LOCALE_GENRE_ARTS_8,
+	LOCALE_GENRE_ARTS_9,
+	LOCALE_GENRE_CHILDRENS_PROGRAMMES_0,
+	LOCALE_GENRE_CHILDRENS_PROGRAMMES_1,
+	LOCALE_GENRE_CHILDRENS_PROGRAMMES_2,
+	LOCALE_GENRE_CHILDRENS_PROGRAMMES_3,
+	LOCALE_GENRE_CHILDRENS_PROGRAMMES_4,
+	LOCALE_GENRE_CHILDRENS_PROGRAMMES_5,
+	LOCALE_GENRE_DOCUS_MAGAZINES_0,
+	LOCALE_GENRE_DOCUS_MAGAZINES_1,
+	LOCALE_GENRE_DOCUS_MAGAZINES_2,
+	LOCALE_GENRE_DOCUS_MAGAZINES_3,
+	LOCALE_GENRE_DOCUS_MAGAZINES_4,
+	LOCALE_GENRE_DOCUS_MAGAZINES_5,
+	LOCALE_GENRE_DOCUS_MAGAZINES_6,
+	LOCALE_GENRE_DOCUS_MAGAZINES_7,
+	LOCALE_GENRE_MOVIE_0,
+	LOCALE_GENRE_MOVIE_1,
+	LOCALE_GENRE_MOVIE_2,
+	LOCALE_GENRE_MOVIE_3,
+	LOCALE_GENRE_MOVIE_4,
+	LOCALE_GENRE_MOVIE_5,
+	LOCALE_GENRE_MOVIE_6,
+	LOCALE_GENRE_MOVIE_7,
+	LOCALE_GENRE_MOVIE_8,
+	LOCALE_GENRE_MUSIC_DANCE_0,
+	LOCALE_GENRE_MUSIC_DANCE_1,
+	LOCALE_GENRE_MUSIC_DANCE_2,
+	LOCALE_GENRE_MUSIC_DANCE_3,
+	LOCALE_GENRE_MUSIC_DANCE_4,
+	LOCALE_GENRE_MUSIC_DANCE_5,
+	LOCALE_GENRE_MUSIC_DANCE_6,
+	LOCALE_GENRE_NEWS_0,
+	LOCALE_GENRE_NEWS_1,
+	LOCALE_GENRE_NEWS_2,
+	LOCALE_GENRE_NEWS_3,
+	LOCALE_GENRE_NEWS_4,
+	LOCALE_GENRE_SHOW_0,
+	LOCALE_GENRE_SHOW_1,
+	LOCALE_GENRE_SHOW_2,
+	LOCALE_GENRE_SHOW_3,
+	LOCALE_GENRE_SOCIAL_POLITICAL_0,
+	LOCALE_GENRE_SOCIAL_POLITICAL_1,
+	LOCALE_GENRE_SOCIAL_POLITICAL_2,
+	LOCALE_GENRE_SOCIAL_POLITICAL_3,
+	LOCALE_GENRE_SPORTS_0,
+	LOCALE_GENRE_SPORTS_1,
+	LOCALE_GENRE_SPORTS_10,
+	LOCALE_GENRE_SPORTS_11,
+	LOCALE_GENRE_SPORTS_2,
+	LOCALE_GENRE_SPORTS_3,
+	LOCALE_GENRE_SPORTS_4,
+	LOCALE_GENRE_SPORTS_5,
+	LOCALE_GENRE_SPORTS_6,
+	LOCALE_GENRE_SPORTS_7,
+	LOCALE_GENRE_SPORTS_8,
+	LOCALE_GENRE_SPORTS_9,
+	LOCALE_GENRE_TRAVEL_HOBBIES_0,
+	LOCALE_GENRE_TRAVEL_HOBBIES_1,
+	LOCALE_GENRE_TRAVEL_HOBBIES_2,
+	LOCALE_GENRE_TRAVEL_HOBBIES_3,
+	LOCALE_GENRE_TRAVEL_HOBBIES_4,
+	LOCALE_GENRE_TRAVEL_HOBBIES_5,
+	LOCALE_GENRE_TRAVEL_HOBBIES_6,
+	LOCALE_GENRE_TRAVEL_HOBBIES_7,
+	LOCALE_GENRE_UNKNOWN,
 	LOCALE_APIDSELECTOR_HEAD,
+	LOCALE_AUDIO_SRS_ALGO,
+	LOCALE_AUDIO_SRS_ALGO_LIGHT,
+	LOCALE_AUDIO_SRS_ALGO_NORMAL,
+	LOCALE_AUDIO_SRS_IQ,
+	LOCALE_AUDIO_SRS_NMGR,
+	LOCALE_AUDIO_SRS_VOLUME,
+	LOCALE_AUDIOMENU_PCMOFFSET,
 	LOCALE_AUDIOMENU_ANALOG_MODE,
 	LOCALE_AUDIOMENU_ANALOG_OUT,
 	LOCALE_AUDIOMENU_AUTO_LANG,
@@ -40,7 +145,6 @@ typedef enum
 	LOCALE_AUDIOMENU_HDMI_DD_FORCE,
 	LOCALE_AUDIOMENU_MONOLEFT,
 	LOCALE_AUDIOMENU_MONORIGHT,
-	LOCALE_AUDIOMENU_PCMOFFSET,
 	LOCALE_AUDIOMENU_PREF_LANG,
 	LOCALE_AUDIOMENU_PREF_LANG_HEAD,
 	LOCALE_AUDIOMENU_PREF_LANGUAGES,
@@ -75,7 +179,6 @@ typedef enum
 	LOCALE_AUDIOPLAYER_LOAD_RADIO_STATIONS,
 	LOCALE_AUDIOPLAYER_NAME,
 	LOCALE_AUDIOPLAYER_PAUSE,
-	LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL,
 	LOCALE_AUDIOPLAYER_PLAY,
 	LOCALE_AUDIOPLAYER_PLAYING,
 	LOCALE_AUDIOPLAYER_PLAYLIST_FILEERROR_MSG,
@@ -96,13 +199,7 @@ typedef enum
 	LOCALE_AUDIOPLAYER_SPECTRUM,
 	LOCALE_AUDIOPLAYER_STOP,
 	LOCALE_AUDIOPLAYER_TITLE_ARTIST,
-	LOCALE_AUDIOSELECTMENUE_HEAD,
+	LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL,
-	LOCALE_AUDIO_SRS_ALGO,
-	LOCALE_AUDIO_SRS_ALGO_LIGHT,
-	LOCALE_AUDIO_SRS_ALGO_NORMAL,
-	LOCALE_AUDIO_SRS_IQ,
-	LOCALE_AUDIO_SRS_NMGR,
-	LOCALE_AUDIO_SRS_VOLUME,
 	LOCALE_BOOKMARKMANAGER_DELETE,
 	LOCALE_BOOKMARKMANAGER_NAME,
 	LOCALE_BOOKMARKMANAGER_RENAME,
@@ -182,13 +279,13 @@ typedef enum
 	LOCALE_COLORMENU_MENUCOLORS,
 	LOCALE_COLORMENU_OSD_PRESET,
 	LOCALE_COLORMENU_SD_PRESET,
+	LOCALE_COLORMENU_TEXTCOLOR,
+	LOCALE_COLORMENU_THEMESELECT,
+	LOCALE_COLORMENU_TIMING,
 	LOCALE_COLORMENUSETUP_MENUCONTENT,
 	LOCALE_COLORMENUSETUP_MENUCONTENT_INACTIVE,
 	LOCALE_COLORMENUSETUP_MENUCONTENT_SELECTED,
 	LOCALE_COLORMENUSETUP_MENUHEAD,
-	LOCALE_COLORMENU_TEXTCOLOR,
-	LOCALE_COLORMENU_THEMESELECT,
-	LOCALE_COLORMENU_TIMING,
 	LOCALE_COLORSTATUSBAR_TEXT,
 	LOCALE_COLORTHEMEMENU_HEAD,
 	LOCALE_COLORTHEMEMENU_HEAD2,
@@ -228,36 +325,16 @@ typedef enum
 	LOCALE_EPGEXTENDED_PRESENTER,
 	LOCALE_EPGEXTENDED_YEAR_OF_PRODUCTION,
 	LOCALE_EPGLIST_NOEVENTS,
-	LOCALE_EPGMENU_EPGPLUS,
-	LOCALE_EPGMENU_EVENTINFO,
-	LOCALE_EPGMENU_EVENTLIST,
-	LOCALE_EPGMENU_HEAD,
-	LOCALE_EPGMENU_STREAMINFO,
-	LOCALE_EPGPLUS_ACTIONS,
-	LOCALE_EPGPLUS_BYBOUQUET_MODE,
-	LOCALE_EPGPLUS_BYPAGE_MODE,
-	LOCALE_EPGPLUS_HEAD,
-	LOCALE_EPGPLUS_NEXT_BOUQUET,
-	LOCALE_EPGPLUS_OPTIONS,
-	LOCALE_EPGPLUS_PAGE_DOWN,
-	LOCALE_EPGPLUS_PAGE_UP,
-	LOCALE_EPGPLUS_PREV_BOUQUET,
-	LOCALE_EPGPLUS_RECORD,
-	LOCALE_EPGPLUS_REFRESH_EPG,
-	LOCALE_EPGPLUS_REMIND,
-	LOCALE_EPGPLUS_SCROLL_MODE,
-	LOCALE_EPGPLUS_STRETCH_MODE,
-	LOCALE_EPGPLUS_SWAP_MODE,
-	LOCALE_EPGPLUS_VIEW_MODE,
 	LOCALE_EPGVIEWER_MORE_SCREENINGS,
+	LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT,
 	LOCALE_EPGVIEWER_NODETAILED,
 	LOCALE_EPGVIEWER_NOTFOUND,
 	LOCALE_EVENTFINDER_HEAD,
 	LOCALE_EVENTFINDER_KEYWORD,
 	LOCALE_EVENTFINDER_SEARCH,
-	LOCALE_EVENTFINDER_SEARCHING,
 	LOCALE_EVENTFINDER_SEARCH_WITHIN_EPG,
 	LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST,
+	LOCALE_EVENTFINDER_SEARCHING,
 	LOCALE_EVENTFINDER_START_SEARCH,
 	LOCALE_EVENTLISTBAR_CHANNELSWITCH,
 	LOCALE_EVENTLISTBAR_EVENTSORT,
@@ -326,6 +403,7 @@ typedef enum
 	LOCALE_EXTRA_START_TOSTANDBY,
 	LOCALE_EXTRA_TEMP_TIMESHIFT,
 	LOCALE_EXTRA_TIMESHIFT_PAUSE,
+	LOCALE_EXTRA_TP_POL_V,
 	LOCALE_EXTRA_TP_FEC,
 	LOCALE_EXTRA_TP_FREQ,
 	LOCALE_EXTRA_TP_MOD,
@@ -338,7 +416,6 @@ typedef enum
 	LOCALE_EXTRA_TP_POL_H,
 	LOCALE_EXTRA_TP_POL_L,
 	LOCALE_EXTRA_TP_POL_R,
-	LOCALE_EXTRA_TP_POL_V,
 	LOCALE_EXTRA_TP_RATE,
 	LOCALE_EXTRA_UPDATE_DIR,
 	LOCALE_EXTRA_USE_GOTOXX,
@@ -387,8 +464,8 @@ typedef enum
 	LOCALE_FLASHUPDATE_CANTOPENFILE,
 	LOCALE_FLASHUPDATE_CANTOPENMTD,
 	LOCALE_FLASHUPDATE_CHECKUPDATE,
-	LOCALE_FLASHUPDATE_CURRENTVERSIONDATE,
 	LOCALE_FLASHUPDATE_CURRENTVERSION_SEP,
+	LOCALE_FLASHUPDATE_CURRENTVERSIONDATE,
 	LOCALE_FLASHUPDATE_CURRENTVERSIONTIME,
 	LOCALE_FLASHUPDATE_ERASEFAILED,
 	LOCALE_FLASHUPDATE_ERASING,
@@ -452,10 +529,10 @@ typedef enum
 	LOCALE_FONTMENU_SCALING_Y,
 	LOCALE_FONTMENU_SCALING_Y_HINT2,
 	LOCALE_FONTMENU_SIZES,
+	LOCALE_FONTSIZE_CHANNEL_NUM_ZAP,
 	LOCALE_FONTSIZE_CHANNELLIST,
 	LOCALE_FONTSIZE_CHANNELLIST_DESCR,
 	LOCALE_FONTSIZE_CHANNELLIST_NUMBER,
-	LOCALE_FONTSIZE_CHANNEL_NUM_ZAP,
 	LOCALE_FONTSIZE_EPG_DATE,
 	LOCALE_FONTSIZE_EPG_INFO1,
 	LOCALE_FONTSIZE_EPG_INFO2,
@@ -476,82 +553,6 @@ typedef enum
 	LOCALE_FONTSIZE_MENU_HINT,
 	LOCALE_FONTSIZE_MENU_INFO,
 	LOCALE_FONTSIZE_MENU_TITLE,
-	LOCALE_GENRE_ARTS_0,
-	LOCALE_GENRE_ARTS_1,
-	LOCALE_GENRE_ARTS_10,
-	LOCALE_GENRE_ARTS_11,
-	LOCALE_GENRE_ARTS_2,
-	LOCALE_GENRE_ARTS_3,
-	LOCALE_GENRE_ARTS_4,
-	LOCALE_GENRE_ARTS_5,
-	LOCALE_GENRE_ARTS_6,
-	LOCALE_GENRE_ARTS_7,
-	LOCALE_GENRE_ARTS_8,
-	LOCALE_GENRE_ARTS_9,
-	LOCALE_GENRE_CHILDRENS_PROGRAMMES_0,
-	LOCALE_GENRE_CHILDRENS_PROGRAMMES_1,
-	LOCALE_GENRE_CHILDRENS_PROGRAMMES_2,
-	LOCALE_GENRE_CHILDRENS_PROGRAMMES_3,
-	LOCALE_GENRE_CHILDRENS_PROGRAMMES_4,
-	LOCALE_GENRE_CHILDRENS_PROGRAMMES_5,
-	LOCALE_GENRE_DOCUS_MAGAZINES_0,
-	LOCALE_GENRE_DOCUS_MAGAZINES_1,
-	LOCALE_GENRE_DOCUS_MAGAZINES_2,
-	LOCALE_GENRE_DOCUS_MAGAZINES_3,
-	LOCALE_GENRE_DOCUS_MAGAZINES_4,
-	LOCALE_GENRE_DOCUS_MAGAZINES_5,
-	LOCALE_GENRE_DOCUS_MAGAZINES_6,
-	LOCALE_GENRE_DOCUS_MAGAZINES_7,
-	LOCALE_GENRE_MOVIE_0,
-	LOCALE_GENRE_MOVIE_1,
-	LOCALE_GENRE_MOVIE_2,
-	LOCALE_GENRE_MOVIE_3,
-	LOCALE_GENRE_MOVIE_4,
-	LOCALE_GENRE_MOVIE_5,
-	LOCALE_GENRE_MOVIE_6,
-	LOCALE_GENRE_MOVIE_7,
-	LOCALE_GENRE_MOVIE_8,
-	LOCALE_GENRE_MUSIC_DANCE_0,
-	LOCALE_GENRE_MUSIC_DANCE_1,
-	LOCALE_GENRE_MUSIC_DANCE_2,
-	LOCALE_GENRE_MUSIC_DANCE_3,
-	LOCALE_GENRE_MUSIC_DANCE_4,
-	LOCALE_GENRE_MUSIC_DANCE_5,
-	LOCALE_GENRE_MUSIC_DANCE_6,
-	LOCALE_GENRE_NEWS_0,
-	LOCALE_GENRE_NEWS_1,
-	LOCALE_GENRE_NEWS_2,
-	LOCALE_GENRE_NEWS_3,
-	LOCALE_GENRE_NEWS_4,
-	LOCALE_GENRE_SHOW_0,
-	LOCALE_GENRE_SHOW_1,
-	LOCALE_GENRE_SHOW_2,
-	LOCALE_GENRE_SHOW_3,
-	LOCALE_GENRE_SOCIAL_POLITICAL_0,
-	LOCALE_GENRE_SOCIAL_POLITICAL_1,
-	LOCALE_GENRE_SOCIAL_POLITICAL_2,
-	LOCALE_GENRE_SOCIAL_POLITICAL_3,
-	LOCALE_GENRE_SPORTS_0,
-	LOCALE_GENRE_SPORTS_1,
-	LOCALE_GENRE_SPORTS_10,
-	LOCALE_GENRE_SPORTS_11,
-	LOCALE_GENRE_SPORTS_2,
-	LOCALE_GENRE_SPORTS_3,
-	LOCALE_GENRE_SPORTS_4,
-	LOCALE_GENRE_SPORTS_5,
-	LOCALE_GENRE_SPORTS_6,
-	LOCALE_GENRE_SPORTS_7,
-	LOCALE_GENRE_SPORTS_8,
-	LOCALE_GENRE_SPORTS_9,
-	LOCALE_GENRE_TRAVEL_HOBBIES_0,
-	LOCALE_GENRE_TRAVEL_HOBBIES_1,
-	LOCALE_GENRE_TRAVEL_HOBBIES_2,
-	LOCALE_GENRE_TRAVEL_HOBBIES_3,
-	LOCALE_GENRE_TRAVEL_HOBBIES_4,
-	LOCALE_GENRE_TRAVEL_HOBBIES_5,
-	LOCALE_GENRE_TRAVEL_HOBBIES_6,
-	LOCALE_GENRE_TRAVEL_HOBBIES_7,
-	LOCALE_GENRE_UNKNOWN,
 	LOCALE_HDD_10MIN,
 	LOCALE_HDD_1MIN,
 	LOCALE_HDD_20MIN,
@@ -606,6 +607,7 @@ typedef enum
 	LOCALE_INFOVIEWER_WAITTIME,
 	LOCALE_IPSETUP_HINT_1,
 	LOCALE_IPSETUP_HINT_2,
+	LOCALE_KEYBINDINGMENU_RC,
 	LOCALE_KEYBINDINGMENU_ADDRECORD,
 	LOCALE_KEYBINDINGMENU_ADDREMIND,
 	LOCALE_KEYBINDINGMENU_ALLCHANNELS_ON_OK,
@@ -621,17 +623,16 @@ typedef enum
 	LOCALE_KEYBINDINGMENU_HEAD,
 	LOCALE_KEYBINDINGMENU_LASTCHANNEL,
 	LOCALE_KEYBINDINGMENU_MISC,
-	LOCALE_KEYBINDINGMENU_MODECHANGE,
 	LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV,
 	LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_INFOBAR,
 	LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_VOLUME,
 	LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_VZAP,
 	LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_ZAP,
+	LOCALE_KEYBINDINGMENU_MODECHANGE,
 	LOCALE_KEYBINDINGMENU_PAGEDOWN,
 	LOCALE_KEYBINDINGMENU_PAGEUP,
 	LOCALE_KEYBINDINGMENU_POWEROFF,
 	LOCALE_KEYBINDINGMENU_QUICKZAP,
-	LOCALE_KEYBINDINGMENU_RC,
 	LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE,
 	LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_COOLSTREAM,
 	LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_DBOX,
@@ -648,20 +649,20 @@ typedef enum
 	LOCALE_KEYBINDINGMENU_TVRADIOMODE,
 	LOCALE_KEYBINDINGMENU_ZAPHISTORY,
 	LOCALE_KEYCHOOSER_HEAD,
+	LOCALE_KEYCHOOSER_TEXT1,
+	LOCALE_KEYCHOOSER_TEXT2,
 	LOCALE_KEYCHOOSERMENU_CURRENTKEY,
 	LOCALE_KEYCHOOSERMENU_SETNEW,
 	LOCALE_KEYCHOOSERMENU_SETNONE,
-	LOCALE_KEYCHOOSER_TEXT1,
-	LOCALE_KEYCHOOSER_TEXT2,
 	LOCALE_LANGUAGESETUP_HEAD,
 	LOCALE_LANGUAGESETUP_OSD,
 	LOCALE_LANGUAGESETUP_SELECT,
-	LOCALE_LCDCONTROLER_BRIGHTNESS,
-	LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY,
-	LOCALE_LCDCONTROLER_BRIGHTNESSSTANDBY,
 	LOCALE_LCD_INFO_LINE,
 	LOCALE_LCD_INFO_LINE_CHANNEL,
 	LOCALE_LCD_INFO_LINE_CLOCK,
+	LOCALE_LCDCONTROLER_BRIGHTNESS,
+	LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY,
+	LOCALE_LCDCONTROLER_BRIGHTNESSSTANDBY,
 	LOCALE_LCDMENU_DIM_BRIGHTNESS,
 	LOCALE_LCDMENU_DIM_TIME,
 	LOCALE_LCDMENU_HEAD,
@@ -723,6 +724,12 @@ typedef enum
 	LOCALE_MENU_HINT_AUDIO_AVSYNC,
 	LOCALE_MENU_HINT_AUDIO_DD,
 	LOCALE_MENU_HINT_AUDIO_HDMI_DD,
+	LOCALE_MENU_HINT_AUDIO_SPDIF_DD,
+	LOCALE_MENU_HINT_AUDIO_SRS,
+	LOCALE_MENU_HINT_AUDIO_SRS_ALGO,
+	LOCALE_MENU_HINT_AUDIO_SRS_NMGR,
+	LOCALE_MENU_HINT_AUDIO_SRS_VOLUME,
+	LOCALE_MENU_HINT_AUDIO_VOLSTEP,
 	LOCALE_MENU_HINT_AUDIOPLAYER_DEFDIR,
 	LOCALE_MENU_HINT_AUDIOPLAYER_FOLLOW,
 	LOCALE_MENU_HINT_AUDIOPLAYER_HIGHPRIO,
@@ -732,12 +739,6 @@ typedef enum
 	LOCALE_MENU_HINT_AUDIOPLAYER_SC_METADATA,
 	LOCALE_MENU_HINT_AUDIOPLAYER_SCREENSAVER,
 	LOCALE_MENU_HINT_AUDIOPLAYER_TITLE,
-	LOCALE_MENU_HINT_AUDIO_SPDIF_DD,
-	LOCALE_MENU_HINT_AUDIO_SRS,
-	LOCALE_MENU_HINT_AUDIO_SRS_ALGO,
-	LOCALE_MENU_HINT_AUDIO_SRS_NMGR,
-	LOCALE_MENU_HINT_AUDIO_SRS_VOLUME,
-	LOCALE_MENU_HINT_AUDIO_VOLSTEP,
 	LOCALE_MENU_HINT_AUTO_LANG,
 	LOCALE_MENU_HINT_AUTO_SUBS,
 	LOCALE_MENU_HINT_BACK,
@@ -768,8 +769,8 @@ typedef enum
 	LOCALE_MENU_HINT_EPG_MAX_EVENTS,
 	LOCALE_MENU_HINT_EPG_OLD_EVENTS,
 	LOCALE_MENU_HINT_EPG_SAVE,
-	LOCALE_MENU_HINT_EVENTLIST_FONTS,
 	LOCALE_MENU_HINT_EVENT_TEXTCOLOR,
+	LOCALE_MENU_HINT_EVENTLIST_FONTS,
 	LOCALE_MENU_HINT_EXTENDED,
 	LOCALE_MENU_HINT_FACTORY,
 	LOCALE_MENU_HINT_FADE,
@@ -779,9 +780,9 @@ typedef enum
 	LOCALE_MENU_HINT_FILEPLAY,
 	LOCALE_MENU_HINT_FILESYSTEM_IS_UTF8,
 	LOCALE_MENU_HINT_FONT_GUI,
-	LOCALE_MENU_HINT_FONTS,
 	LOCALE_MENU_HINT_FONT_SCALING,
 	LOCALE_MENU_HINT_FONT_TTX,
+	LOCALE_MENU_HINT_FONTS,
 	LOCALE_MENU_HINT_GAMELIST_FONTS,
 	LOCALE_MENU_HINT_GAMES,
 	LOCALE_MENU_HINT_HDD,
@@ -794,9 +795,9 @@ typedef enum
 	LOCALE_MENU_HINT_HEAD_BACK,
 	LOCALE_MENU_HINT_HEAD_TEXTCOLOR,
 	LOCALE_MENU_HINT_IMAGEINFO,
+	LOCALE_MENU_HINT_INACT_TIMER,
 	LOCALE_MENU_HINT_INACTIVE_BACK,
 	LOCALE_MENU_HINT_INACTIVE_TEXTCOLOR,
-	LOCALE_MENU_HINT_INACT_TIMER,
 	LOCALE_MENU_HINT_INET_RADIO,
 	LOCALE_MENU_HINT_INFO,
 	LOCALE_MENU_HINT_INFOBAR_BACK,
@@ -822,9 +823,9 @@ typedef enum
 	LOCALE_MENU_HINT_KEY_BOUQUETDOWN,
 	LOCALE_MENU_HINT_KEY_BOUQUETUP,
 	LOCALE_MENU_HINT_KEY_CANCEL,
+	LOCALE_MENU_HINT_KEY_CHANNEL_SMS,
 	LOCALE_MENU_HINT_KEY_CHANNELDOWN,
 	LOCALE_MENU_HINT_KEY_CHANNELLIST,
-	LOCALE_MENU_HINT_KEY_CHANNEL_SMS,
 	LOCALE_MENU_HINT_KEY_CHANNELUP,
 	LOCALE_MENU_HINT_KEY_HARDWARE,
 	LOCALE_MENU_HINT_KEY_HISTORY,
@@ -852,7 +853,6 @@ typedef enum
 	LOCALE_MENU_HINT_KEY_REPEATBLOCK,
 	LOCALE_MENU_HINT_KEY_REPEATBLOCKGENERIC,
 	LOCALE_MENU_HINT_KEY_RIGHT,
-	LOCALE_MENU_HINT_KEYS,
 	LOCALE_MENU_HINT_KEY_SAVE,
 	LOCALE_MENU_HINT_KEY_SCREENSHOT,
 	LOCALE_MENU_HINT_KEY_SORT,
@@ -861,6 +861,7 @@ typedef enum
 	LOCALE_MENU_HINT_KEY_TRANSPONDER,
 	LOCALE_MENU_HINT_KEY_TVRADIOMODE,
 	LOCALE_MENU_HINT_KEY_UNLOCK,
+	LOCALE_MENU_HINT_KEYS,
 	LOCALE_MENU_HINT_LANG_PREF,
 	LOCALE_MENU_HINT_LANGUAGE,
 	LOCALE_MENU_HINT_LAST_RADIO,
@@ -942,13 +943,12 @@ typedef enum
 	LOCALE_MENU_HINT_REBOOT,
 	LOCALE_MENU_HINT_RECORD_APID_AC3,
 	LOCALE_MENU_HINT_RECORD_APID_ALT,
-	LOCALE_MENU_HINT_RECORD_APIDS,
 	LOCALE_MENU_HINT_RECORD_APID_STD,
+	LOCALE_MENU_HINT_RECORD_APIDS,
 	LOCALE_MENU_HINT_RECORD_APPLY,
 	LOCALE_MENU_HINT_RECORD_CHANDIR,
 	LOCALE_MENU_HINT_RECORD_DIR,
 	LOCALE_MENU_HINT_RECORD_END,
-	LOCALE_MENU_HINT_RECORDING,
 	LOCALE_MENU_HINT_RECORD_TDIR,
 	LOCALE_MENU_HINT_RECORD_TIME,
 	LOCALE_MENU_HINT_RECORD_TIMEAFTER,
@@ -961,14 +961,15 @@ typedef enum
 	LOCALE_MENU_HINT_RECORD_TIMESHIFT_TEMP,
 	LOCALE_MENU_HINT_RECORD_ZAP,
 	LOCALE_MENU_HINT_RECORD_ZAP_PRE_TIME,
+	LOCALE_MENU_HINT_RECORDING,
 	LOCALE_MENU_HINT_RELOAD_CHANNELS,
 	LOCALE_MENU_HINT_RELOAD_PLUGINS,
 	LOCALE_MENU_HINT_RESET,
 	LOCALE_MENU_HINT_RESTORE,
 	LOCALE_MENU_HINT_ROTOR_SWAP,
 	LOCALE_MENU_HINT_ROUNDED_CORNERS,
-	LOCALE_MENU_HINT_SAVEAS,
 	LOCALE_MENU_HINT_SAVE_SETTINGS,
+	LOCALE_MENU_HINT_SAVEAS,
 	LOCALE_MENU_HINT_SCAN_AUTO,
 	LOCALE_MENU_HINT_SCAN_AUTOALL,
 	LOCALE_MENU_HINT_SCAN_AUTOALL_SELECT,
@@ -1000,8 +1001,8 @@ typedef enum
 	LOCALE_MENU_HINT_SCAN_LONGITUDE,
 	LOCALE_MENU_HINT_SCAN_MANUAL,
 	LOCALE_MENU_HINT_SCAN_MOD,
-	LOCALE_MENU_HINT_SCAN_MOTORPOS,
 	LOCALE_MENU_HINT_SCAN_MOTOR_SPEED,
+	LOCALE_MENU_HINT_SCAN_MOTORPOS,
 	LOCALE_MENU_HINT_SCAN_NID,
 	LOCALE_MENU_HINT_SCAN_NIT,
 	LOCALE_MENU_HINT_SCAN_PIDS,
@@ -1023,8 +1024,8 @@ typedef enum
 	LOCALE_MENU_HINT_SCAN_TEST,
 	LOCALE_MENU_HINT_SCAN_TPSELECT,
 	LOCALE_MENU_HINT_SCAN_UNCOMMITED,
-	LOCALE_MENU_HINT_SCAN_USALSALL,
 	LOCALE_MENU_HINT_SCAN_USALS_REPEAT,
+	LOCALE_MENU_HINT_SCAN_USALSALL,
 	LOCALE_MENU_HINT_SCAN_USEUSALS,
 	LOCALE_MENU_HINT_SCRAMBLED_MESSAGE,
 	LOCALE_MENU_HINT_SCREEN_SETUP,
@@ -1061,9 +1062,9 @@ typedef enum
 	LOCALE_MENU_HINT_TVRADIO_SWITCH,
 	LOCALE_MENU_HINT_VFD,
 	LOCALE_MENU_HINT_VFD_BRIGHTNESS,
+	LOCALE_MENU_HINT_VFD_BRIGHTNESS_SETUP,
 	LOCALE_MENU_HINT_VFD_BRIGHTNESSDEEPSTANDBY,
 	LOCALE_MENU_HINT_VFD_BRIGHTNESSDIM,
-	LOCALE_MENU_HINT_VFD_BRIGHTNESS_SETUP,
 	LOCALE_MENU_HINT_VFD_BRIGHTNESSSTANDBY,
 	LOCALE_MENU_HINT_VFD_DEFAULTS,
 	LOCALE_MENU_HINT_VFD_DIMTIME,
@@ -1358,13 +1359,12 @@ typedef enum
 	LOCALE_NFS_DIR,
 	LOCALE_NFS_IP,
 	LOCALE_NFS_LOCALDIR,
-	LOCALE_NFSMENU_HEAD,
 	LOCALE_NFS_MOUNT,
+	LOCALE_NFS_MOUNT_OPTIONS,
 	LOCALE_NFS_MOUNTERROR,
 	LOCALE_NFS_MOUNTERROR_NOTSUP,
 	LOCALE_NFS_MOUNTNOW,
 	LOCALE_NFS_MOUNTOK,
-	LOCALE_NFS_MOUNT_OPTIONS,
 	LOCALE_NFS_MOUNTTIMEOUT,
 	LOCALE_NFS_PASSWORD,
 	LOCALE_NFS_REMOUNT,
@@ -1375,11 +1375,12 @@ typedef enum
 	LOCALE_NFS_UMOUNT,
 	LOCALE_NFS_UMOUNTERROR,
 	LOCALE_NFS_USERNAME,
+	LOCALE_NFSMENU_HEAD,
 	LOCALE_NVOD_PERCENTAGE,
+	LOCALE_NVOD_STARTING,
 	LOCALE_NVODSELECTOR_DIRECTORMODE,
 	LOCALE_NVODSELECTOR_HEAD,
 	LOCALE_NVODSELECTOR_SUBSERVICE,
-	LOCALE_NVOD_STARTING,
 	LOCALE_OPTIONS_DEFAULT,
 	LOCALE_OPTIONS_FB,
 	LOCALE_OPTIONS_NTP_OFF,
@@ -1427,9 +1428,9 @@ typedef enum
 	LOCALE_PERSONALIZE_NOTPROTECTED,
 	LOCALE_PERSONALIZE_NOTVISIBLE,
 	LOCALE_PERSONALIZE_PIN,
+	LOCALE_PERSONALIZE_PIN_IN_USE,
 	LOCALE_PERSONALIZE_PINCODE,
 	LOCALE_PERSONALIZE_PINHINT,
-	LOCALE_PERSONALIZE_PIN_IN_USE,
 	LOCALE_PERSONALIZE_PINPROTECT,
 	LOCALE_PERSONALIZE_PINSTATUS,
 	LOCALE_PERSONALIZE_PLUGINS,
@@ -1465,8 +1466,8 @@ typedef enum
 	LOCALE_PICTUREVIEWER_RESIZE_SIMPLE,
 	LOCALE_PICTUREVIEWER_SCALING,
 	LOCALE_PICTUREVIEWER_SHOW,
-	LOCALE_PICTUREVIEWER_SLIDESHOW,
 	LOCALE_PICTUREVIEWER_SLIDE_TIME,
+	LOCALE_PICTUREVIEWER_SLIDESHOW,
 	LOCALE_PICTUREVIEWER_SORTORDER_DATE,
 	LOCALE_PICTUREVIEWER_SORTORDER_FILENAME,
 	LOCALE_PING_OK,
@@ -1483,6 +1484,8 @@ typedef enum
 	LOCALE_RCLOCK_TITLE,
 	LOCALE_RCLOCK_UNLOCKMSG,
 	LOCALE_RECORDING_IS_RUNNING,
+	LOCALE_RECORDING_START,
+	LOCALE_RECORDING_STOP,
 	LOCALE_RECORDINGMENU_APIDS,
 	LOCALE_RECORDINGMENU_APIDS_AC3,
 	LOCALE_RECORDINGMENU_APIDS_ALT,
@@ -1509,8 +1512,6 @@ typedef enum
 	LOCALE_RECORDINGMENU_TSDIR,
 	LOCALE_RECORDINGMENU_VCR,
 	LOCALE_RECORDINGMENU_ZAP_ON_ANNOUNCE,
-	LOCALE_RECORDING_START,
-	LOCALE_RECORDING_STOP,
 	LOCALE_RECORDTIMER_ANNOUNCE,
 	LOCALE_REPEATBLOCKER_HINT_1,
 	LOCALE_REPEATBLOCKER_HINT_2,
@@ -1530,8 +1531,8 @@ typedef enum
 	LOCALE_SATSETUP_DISEQC_ADVANCED,
 	LOCALE_SATSETUP_DISEQC_COM_UNCOM,
 	LOCALE_SATSETUP_DISEQC_INPUT,
-	LOCALE_SATSETUP_DISEQCREPEAT,
 	LOCALE_SATSETUP_DISEQC_UNCOM_COM,
+	LOCALE_SATSETUP_DISEQCREPEAT,
 	LOCALE_SATSETUP_EXTENDED,
 	LOCALE_SATSETUP_EXTENDED_MOTOR,
 	LOCALE_SATSETUP_FASTSCAN_ALL,
@@ -1559,8 +1560,8 @@ typedef enum
 	LOCALE_SATSETUP_MOTOR_POS,
 	LOCALE_SATSETUP_NODISEQC,
 	LOCALE_SATSETUP_RESET_NUMBERS,
-	LOCALE_SATSETUP_SATELLITE,
 	LOCALE_SATSETUP_SAT_SETUP,
+	LOCALE_SATSETUP_SATELLITE,
 	LOCALE_SATSETUP_SELECT_SAT,
 	LOCALE_SATSETUP_SMATVREMOTE,
 	LOCALE_SATSETUP_UNCOMM_INPUT,
@@ -1569,6 +1570,14 @@ typedef enum
 	LOCALE_SATSETUP_USE_FTA_FLAG,
 	LOCALE_SATSETUP_USE_NIT,
 	LOCALE_SATSETUP_USE_USALS,
+	LOCALE_SC_EMPTY,
+	LOCALE_SC_INIT_FAILED,
+	LOCALE_SC_INIT_OK,
+	LOCALE_SC_INSERTED,
+	LOCALE_SC_REMOVED,
+	LOCALE_SC_RESET,
+	LOCALE_SC_TIMEOUT,
+	LOCALE_SC_WAITING,
 	LOCALE_SCANTS_ABORT_BODY,
 	LOCALE_SCANTS_ABORT_HEADER,
 	LOCALE_SCANTS_ACTCABLE,
@@ -1595,10 +1604,6 @@ typedef enum
 	LOCALE_SCANTS_STARTNOW,
 	LOCALE_SCANTS_TEST,
 	LOCALE_SCANTS_TRANSPONDERS,
-	LOCALE_SC_EMPTY,
-	LOCALE_SC_INIT_FAILED,
-	LOCALE_SC_INIT_OK,
-	LOCALE_SC_INSERTED,
 	LOCALE_SCRAMBLED_CHANNEL,
 	LOCALE_SCREENSETUP_LOWERRIGHT,
 	LOCALE_SCREENSETUP_UPPERLEFT,
@@ -1613,10 +1618,6 @@ typedef enum
 	LOCALE_SCREENSHOT_SCALE,
 	LOCALE_SCREENSHOT_TV,
 	LOCALE_SCREENSHOT_VIDEO,
-	LOCALE_SC_REMOVED,
-	LOCALE_SC_RESET,
-	LOCALE_SC_TIMEOUT,
-	LOCALE_SC_WAITING,
 	LOCALE_SERVICEMENU_GETPLUGINS,
 	LOCALE_SERVICEMENU_GETPLUGINS_HINT,
 	LOCALE_SERVICEMENU_HEAD,
@@ -1669,12 +1670,12 @@ typedef enum
 	LOCALE_STRINGINPUT_CLEAR,
 	LOCALE_SUBTITLES_HEAD,
 	LOCALE_SUBTITLES_STOP,
-	LOCALE_TIMERBAR_CHANNELSWITCH,
-	LOCALE_TIMERBAR_RECORDEVENT,
 	LOCALE_TIMER_EVENTRECORD_MSG,
 	LOCALE_TIMER_EVENTRECORD_TITLE,
 	LOCALE_TIMER_EVENTTIMED_MSG,
 	LOCALE_TIMER_EVENTTIMED_TITLE,
+	LOCALE_TIMERBAR_CHANNELSWITCH,
+	LOCALE_TIMERBAR_RECORDEVENT,
 	LOCALE_TIMERLIST_ALARMTIME,
 	LOCALE_TIMERLIST_APIDS,
 	LOCALE_TIMERLIST_APIDS_DFLT,
@@ -1699,9 +1700,6 @@ typedef enum
 	LOCALE_TIMERLIST_REPEAT,
 	LOCALE_TIMERLIST_REPEAT_BIWEEKLY,
 	LOCALE_TIMERLIST_REPEAT_BYEVENTDESCRIPTION,
-	LOCALE_TIMERLIST_REPEATCOUNT,
-	LOCALE_TIMERLIST_REPEATCOUNT_HELP1,
-	LOCALE_TIMERLIST_REPEATCOUNT_HELP2,
 	LOCALE_TIMERLIST_REPEAT_DAILY,
 	LOCALE_TIMERLIST_REPEAT_FOURWEEKLY,
 	LOCALE_TIMERLIST_REPEAT_FRIDAY,
@@ -1716,6 +1714,9 @@ typedef enum
 	LOCALE_TIMERLIST_REPEAT_WEDNESDAY,
 	LOCALE_TIMERLIST_REPEAT_WEEKDAYS,
 	LOCALE_TIMERLIST_REPEAT_WEEKLY,
+	LOCALE_TIMERLIST_REPEATCOUNT,
+	LOCALE_TIMERLIST_REPEATCOUNT_HELP1,
+	LOCALE_TIMERLIST_REPEATCOUNT_HELP2,
 	LOCALE_TIMERLIST_SAVE,
 	LOCALE_TIMERLIST_STANDBY,
 	LOCALE_TIMERLIST_STANDBY_OFF,
@@ -1768,6 +1769,7 @@ typedef enum
 	LOCALE_USERMENU_MSG_WARNING_NAME,
 	LOCALE_USERMENU_MSG_WARNING_NO_ITEMS,
 	LOCALE_USERMENU_NAME,
+	LOCALE_VIDEO_MODE_OK,
 	LOCALE_VIDEOMENU_43MODE,
 	LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH,
 	LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART,
@@ -1812,7 +1814,6 @@ typedef enum
 	LOCALE_VIDEOMENU_VIDEOFORMAT_169,
 	LOCALE_VIDEOMENU_VIDEOFORMAT_43,
 	LOCALE_VIDEOMENU_VIDEOMODE,
-	LOCALE_VIDEO_MODE_OK,
 	LOCALE_WIZARD_WELCOME_HEAD,
 	LOCALE_WIZARD_WELCOME_TEXT,
 	LOCALE_WORD_FROM,

src/system/locals_intern.h

@@ -25,7 +25,112 @@
 const char * locale_real_names[] =
 {
 	"INTERNAL ERROR - PLEASE REPORT",
+	"AUDIOSelectMenue.head",
+	"EPGMenu.epgplus",
+	"EPGMenu.eventinfo",
+	"EPGMenu.eventlist",
+	"EPGMenu.head",
+	"EPGMenu.streaminfo",
+	"EPGPlus.actions",
+	"EPGPlus.bybouquet_mode",
+	"EPGPlus.bypage_mode",
+	"EPGPlus.head",
+	"EPGPlus.next_bouquet",
+	"EPGPlus.options",
+	"EPGPlus.page_down",
+	"EPGPlus.page_up",
+	"EPGPlus.prev_bouquet",
+	"EPGPlus.record",
+	"EPGPlus.refresh_epg",
+	"EPGPlus.remind",
+	"EPGPlus.scroll_mode",
+	"EPGPlus.stretch_mode",
+	"EPGPlus.swap_mode",
+	"EPGPlus.view_mode",
+	"GENRE.ARTS.0",
+	"GENRE.ARTS.1",
+	"GENRE.ARTS.10",
+	"GENRE.ARTS.11",
+	"GENRE.ARTS.2",
+	"GENRE.ARTS.3",
+	"GENRE.ARTS.4",
+	"GENRE.ARTS.5",
+	"GENRE.ARTS.6",
+	"GENRE.ARTS.7",
+	"GENRE.ARTS.8",
+	"GENRE.ARTS.9",
+	"GENRE.CHILDRENs_PROGRAMMES.0",
+	"GENRE.CHILDRENs_PROGRAMMES.1",
+	"GENRE.CHILDRENs_PROGRAMMES.2",
+	"GENRE.CHILDRENs_PROGRAMMES.3",
+	"GENRE.CHILDRENs_PROGRAMMES.4",
+	"GENRE.CHILDRENs_PROGRAMMES.5",
+	"GENRE.DOCUS_MAGAZINES.0",
+	"GENRE.DOCUS_MAGAZINES.1",
+	"GENRE.DOCUS_MAGAZINES.2",
+	"GENRE.DOCUS_MAGAZINES.3",
+	"GENRE.DOCUS_MAGAZINES.4",
+	"GENRE.DOCUS_MAGAZINES.5",
+	"GENRE.DOCUS_MAGAZINES.6",
+	"GENRE.DOCUS_MAGAZINES.7",
+	"GENRE.MOVIE.0",
+	"GENRE.MOVIE.1",
+	"GENRE.MOVIE.2",
+	"GENRE.MOVIE.3",
+	"GENRE.MOVIE.4",
+	"GENRE.MOVIE.5",
+	"GENRE.MOVIE.6",
+	"GENRE.MOVIE.7",
+	"GENRE.MOVIE.8",
+	"GENRE.MUSIC_DANCE.0",
+	"GENRE.MUSIC_DANCE.1",
+	"GENRE.MUSIC_DANCE.2",
+	"GENRE.MUSIC_DANCE.3",
+	"GENRE.MUSIC_DANCE.4",
+	"GENRE.MUSIC_DANCE.5",
+	"GENRE.MUSIC_DANCE.6",
+	"GENRE.NEWS.0",
+	"GENRE.NEWS.1",
+	"GENRE.NEWS.2",
+	"GENRE.NEWS.3",
+	"GENRE.NEWS.4",
+	"GENRE.SHOW.0",
+	"GENRE.SHOW.1",
+	"GENRE.SHOW.2",
+	"GENRE.SHOW.3",
+	"GENRE.SOCIAL_POLITICAL.0",
+	"GENRE.SOCIAL_POLITICAL.1",
+	"GENRE.SOCIAL_POLITICAL.2",
+	"GENRE.SOCIAL_POLITICAL.3",
+	"GENRE.SPORTS.0",
+	"GENRE.SPORTS.1",
+	"GENRE.SPORTS.10",
+	"GENRE.SPORTS.11",
+	"GENRE.SPORTS.2",
+	"GENRE.SPORTS.3",
+	"GENRE.SPORTS.4",
+	"GENRE.SPORTS.5",
+	"GENRE.SPORTS.6",
+	"GENRE.SPORTS.7",
+	"GENRE.SPORTS.8",
+	"GENRE.SPORTS.9",
+	"GENRE.TRAVEL_HOBBIES.0",
+	"GENRE.TRAVEL_HOBBIES.1",
+	"GENRE.TRAVEL_HOBBIES.2",
+	"GENRE.TRAVEL_HOBBIES.3",
+	"GENRE.TRAVEL_HOBBIES.4",
+	"GENRE.TRAVEL_HOBBIES.5",
+	"GENRE.TRAVEL_HOBBIES.6",
+	"GENRE.TRAVEL_HOBBIES.7",
+	"GENRE.UNKNOWN",
 	"apidselector.head",
+	"audio.srs_algo",
+	"audio.srs_algo_light",
+	"audio.srs_algo_normal",
+	"audio.srs_iq",
+	"audio.srs_nmgr",
+	"audio.srs_volume",
+	"audiomenu.PCMOffset",
 	"audiomenu.analog_mode",
 	"audiomenu.analog_out",
 	"audiomenu.auto_lang",
@@ -40,7 +145,6 @@ const char * locale_real_names[] =
 	"audiomenu.hdmi_dd_force",
 	"audiomenu.monoleft",
 	"audiomenu.monoright",
-	"audiomenu.PCMOffset",
 	"audiomenu.pref_lang",
 	"audiomenu.pref_lang_head",
 	"audiomenu.pref_languages",
@@ -75,7 +179,6 @@ const char * locale_real_names[] =
 	"audioplayer.load_radio_stations",
 	"audioplayer.name",
 	"audioplayer.pause",
-	"audioplayerpicsettings.general",
 	"audioplayer.play",
 	"audioplayer.playing",
 	"audioplayer.playlist_fileerror_msg",
@@ -96,13 +199,7 @@ const char * locale_real_names[] =
 	"audioplayer.spectrum",
 	"audioplayer.stop",
 	"audioplayer.title_artist",
-	"AUDIOSelectMenue.head",
+	"audioplayerpicsettings.general",
-	"audio.srs_algo",
-	"audio.srs_algo_light",
-	"audio.srs_algo_normal",
-	"audio.srs_iq",
-	"audio.srs_nmgr",
-	"audio.srs_volume",
 	"bookmarkmanager.delete",
 	"bookmarkmanager.name",
 	"bookmarkmanager.rename",
@@ -182,13 +279,13 @@ const char * locale_real_names[] =
 	"colormenu.menucolors",
 	"colormenu.osd_preset",
 	"colormenu.sd_preset",
+	"colormenu.textcolor",
+	"colormenu.themeselect",
+	"colormenu.timing",
 	"colormenusetup.menucontent",
 	"colormenusetup.menucontent_inactive",
 	"colormenusetup.menucontent_selected",
 	"colormenusetup.menuhead",
-	"colormenu.textcolor",
-	"colormenu.themeselect",
-	"colormenu.timing",
 	"colorstatusbar.text",
 	"colorthememenu.head",
 	"colorthememenu.head2",
@@ -228,36 +325,16 @@ const char * locale_real_names[] =
 	"epgextended.presenter",
 	"epgextended.year_of_production",
 	"epglist.noevents",
-	"EPGMenu.epgplus",
-	"EPGMenu.eventinfo",
-	"EPGMenu.eventlist",
-	"EPGMenu.head",
-	"EPGMenu.streaminfo",
-	"EPGPlus.actions",
-	"EPGPlus.bybouquet_mode",
-	"EPGPlus.bypage_mode",
-	"EPGPlus.head",
-	"EPGPlus.next_bouquet",
-	"EPGPlus.options",
-	"EPGPlus.page_down",
-	"EPGPlus.page_up",
-	"EPGPlus.prev_bouquet",
-	"EPGPlus.record",
-	"EPGPlus.refresh_epg",
-	"EPGPlus.remind",
-	"EPGPlus.scroll_mode",
-	"EPGPlus.stretch_mode",
-	"EPGPlus.swap_mode",
-	"EPGPlus.view_mode",
 	"epgviewer.More_Screenings",
+	"epgviewer.More_Screenings_short",
 	"epgviewer.nodetailed",
 	"epgviewer.notfound",
 	"eventfinder.head",
 	"eventfinder.keyword",
 	"eventfinder.search",
-	"eventfinder.searching",
 	"eventfinder.search_within_epg",
 	"eventfinder.search_within_list",
+	"eventfinder.searching",
 	"eventfinder.start_search",
 	"eventlistbar.channelswitch",
 	"eventlistbar.eventsort",
@@ -326,6 +403,7 @@ const char * locale_real_names[] =
 	"extra.start_tostandby",
 	"extra.temp_timeshift",
 	"extra.timeshift_pause",
+	"extra.tp.pol_v",
 	"extra.tp_fec",
 	"extra.tp_freq",
 	"extra.tp_mod",
@@ -338,7 +416,6 @@ const char * locale_real_names[] =
 	"extra.tp_pol_h",
 	"extra.tp_pol_l",
 	"extra.tp_pol_r",
-	"extra.tp.pol_v",
 	"extra.tp_rate",
 	"extra.update_dir",
 	"extra.use_gotoxx",
@@ -387,8 +464,8 @@ const char * locale_real_names[] =
 	"flashupdate.cantopenfile",
 	"flashupdate.cantopenmtd",
 	"flashupdate.checkupdate",
-	"flashupdate.currentversiondate",
 	"flashupdate.currentversion_sep",
+	"flashupdate.currentversiondate",
 	"flashupdate.currentversiontime",
 	"flashupdate.erasefailed",
 	"flashupdate.erasing",
@@ -452,10 +529,10 @@ const char * locale_real_names[] =
 	"fontmenu.scaling_y",
 	"fontmenu.scaling_y_hint2",
 	"fontmenu.sizes",
+	"fontsize.channel_num_zap",
 	"fontsize.channellist",
 	"fontsize.channellist_descr",
 	"fontsize.channellist_number",
-	"fontsize.channel_num_zap",
 	"fontsize.epg_date",
 	"fontsize.epg_info1",
 	"fontsize.epg_info2",
@@ -476,82 +553,6 @@ const char * locale_real_names[] =
 	"fontsize.menu_hint",
 	"fontsize.menu_info",
 	"fontsize.menu_title",
-	"GENRE.ARTS.0",
-	"GENRE.ARTS.1",
-	"GENRE.ARTS.10",
-	"GENRE.ARTS.11",
-	"GENRE.ARTS.2",
-	"GENRE.ARTS.3",
-	"GENRE.ARTS.4",
-	"GENRE.ARTS.5",
-	"GENRE.ARTS.6",
-	"GENRE.ARTS.7",
-	"GENRE.ARTS.8",
-	"GENRE.ARTS.9",
-	"GENRE.CHILDRENs_PROGRAMMES.0",
-	"GENRE.CHILDRENs_PROGRAMMES.1",
-	"GENRE.CHILDRENs_PROGRAMMES.2",
-	"GENRE.CHILDRENs_PROGRAMMES.3",
-	"GENRE.CHILDRENs_PROGRAMMES.4",
-	"GENRE.CHILDRENs_PROGRAMMES.5",
-	"GENRE.DOCUS_MAGAZINES.0",
-	"GENRE.DOCUS_MAGAZINES.1",
-	"GENRE.DOCUS_MAGAZINES.2",
-	"GENRE.DOCUS_MAGAZINES.3",
-	"GENRE.DOCUS_MAGAZINES.4",
-	"GENRE.DOCUS_MAGAZINES.5",
-	"GENRE.DOCUS_MAGAZINES.6",
-	"GENRE.DOCUS_MAGAZINES.7",
-	"GENRE.MOVIE.0",
-	"GENRE.MOVIE.1",
-	"GENRE.MOVIE.2",
-	"GENRE.MOVIE.3",
-	"GENRE.MOVIE.4",
-	"GENRE.MOVIE.5",
-	"GENRE.MOVIE.6",
-	"GENRE.MOVIE.7",
-	"GENRE.MOVIE.8",
-	"GENRE.MUSIC_DANCE.0",
-	"GENRE.MUSIC_DANCE.1",
-	"GENRE.MUSIC_DANCE.2",
-	"GENRE.MUSIC_DANCE.3",
-	"GENRE.MUSIC_DANCE.4",
-	"GENRE.MUSIC_DANCE.5",
-	"GENRE.MUSIC_DANCE.6",
-	"GENRE.NEWS.0",
-	"GENRE.NEWS.1",
-	"GENRE.NEWS.2",
-	"GENRE.NEWS.3",
-	"GENRE.NEWS.4",
-	"GENRE.SHOW.0",
-	"GENRE.SHOW.1",
-	"GENRE.SHOW.2",
-	"GENRE.SHOW.3",
-	"GENRE.SOCIAL_POLITICAL.0",
-	"GENRE.SOCIAL_POLITICAL.1",
-	"GENRE.SOCIAL_POLITICAL.2",
-	"GENRE.SOCIAL_POLITICAL.3",
-	"GENRE.SPORTS.0",
-	"GENRE.SPORTS.1",
-	"GENRE.SPORTS.10",
-	"GENRE.SPORTS.11",
-	"GENRE.SPORTS.2",
-	"GENRE.SPORTS.3",
-	"GENRE.SPORTS.4",
-	"GENRE.SPORTS.5",
-	"GENRE.SPORTS.6",
-	"GENRE.SPORTS.7",
-	"GENRE.SPORTS.8",
-	"GENRE.SPORTS.9",
-	"GENRE.TRAVEL_HOBBIES.0",
-	"GENRE.TRAVEL_HOBBIES.1",
-	"GENRE.TRAVEL_HOBBIES.2",
-	"GENRE.TRAVEL_HOBBIES.3",
-	"GENRE.TRAVEL_HOBBIES.4",
-	"GENRE.TRAVEL_HOBBIES.5",
-	"GENRE.TRAVEL_HOBBIES.6",
-	"GENRE.TRAVEL_HOBBIES.7",
-	"GENRE.UNKNOWN",
 	"hdd_10min",
 	"hdd_1min",
 	"hdd_20min",
@@ -606,6 +607,7 @@ const char * locale_real_names[] =
 	"infoviewer.waittime",
 	"ipsetup.hint_1",
 	"ipsetup.hint_2",
+	"keybindingmenu.RC",
 	"keybindingmenu.addrecord",
 	"keybindingmenu.addremind",
 	"keybindingmenu.allchannels_on_ok",
@@ -621,17 +623,16 @@ const char * locale_real_names[] =
 	"keybindingmenu.head",
 	"keybindingmenu.lastchannel",
 	"keybindingmenu.misc",
-	"keybindingmenu.modechange",
 	"keybindingmenu.mode_left_right_key_tv",
 	"keybindingmenu.mode_left_right_key_tv_infobar",
 	"keybindingmenu.mode_left_right_key_tv_volume",
 	"keybindingmenu.mode_left_right_key_tv_vzap",
 	"keybindingmenu.mode_left_right_key_tv_zap",
+	"keybindingmenu.modechange",
 	"keybindingmenu.pagedown",
 	"keybindingmenu.pageup",
 	"keybindingmenu.poweroff",
 	"keybindingmenu.quickzap",
-	"keybindingmenu.RC",
 	"keybindingmenu.remotecontrol_hardware",
 	"keybindingmenu.remotecontrol_hardware_coolstream",
 	"keybindingmenu.remotecontrol_hardware_dbox",
@@ -648,20 +649,20 @@ const char * locale_real_names[] =
 	"keybindingmenu.tvradiomode",
 	"keybindingmenu.zaphistory",
 	"keychooser.head",
+	"keychooser.text1",
+	"keychooser.text2",
 	"keychoosermenu.currentkey",
 	"keychoosermenu.setnew",
 	"keychoosermenu.setnone",
-	"keychooser.text1",
-	"keychooser.text2",
 	"languagesetup.head",
 	"languagesetup.osd",
 	"languagesetup.select",
-	"lcdcontroler.brightness",
-	"lcdcontroler.brightnessdeepstandby",
-	"lcdcontroler.brightnessstandby",
 	"lcd_info_line",
 	"lcd_info_line_channel",
 	"lcd_info_line_clock",
+	"lcdcontroler.brightness",
+	"lcdcontroler.brightnessdeepstandby",
+	"lcdcontroler.brightnessstandby",
 	"lcdmenu.dim_brightness",
 	"lcdmenu.dim_time",
 	"lcdmenu.head",
@@ -723,6 +724,12 @@ const char * locale_real_names[] =
 	"menu.hint_audio_avsync",
 	"menu.hint_audio_dd",
 	"menu.hint_audio_hdmi_dd",
+	"menu.hint_audio_spdif_dd",
+	"menu.hint_audio_srs",
+	"menu.hint_audio_srs_algo",
+	"menu.hint_audio_srs_nmgr",
+	"menu.hint_audio_srs_volume",
+	"menu.hint_audio_volstep",
 	"menu.hint_audioplayer_defdir",
 	"menu.hint_audioplayer_follow",
 	"menu.hint_audioplayer_highprio",
@@ -732,12 +739,6 @@ const char * locale_real_names[] =
 	"menu.hint_audioplayer_sc_metadata",
 	"menu.hint_audioplayer_screensaver",
 	"menu.hint_audioplayer_title",
-	"menu.hint_audio_spdif_dd",
-	"menu.hint_audio_srs",
-	"menu.hint_audio_srs_algo",
-	"menu.hint_audio_srs_nmgr",
-	"menu.hint_audio_srs_volume",
-	"menu.hint_audio_volstep",
 	"menu.hint_auto_lang",
 	"menu.hint_auto_subs",
 	"menu.hint_back",
@@ -768,8 +769,8 @@ const char * locale_real_names[] =
 	"menu.hint_epg_max_events",
 	"menu.hint_epg_old_events",
 	"menu.hint_epg_save",
-	"menu.hint_eventlist_fonts",
 	"menu.hint_event_textcolor",
+	"menu.hint_eventlist_fonts",
 	"menu.hint_extended",
 	"menu.hint_factory",
 	"menu.hint_fade",
@@ -779,9 +780,9 @@ const char * locale_real_names[] =
 	"menu.hint_fileplay",
 	"menu.hint_filesystem_is_utf8",
 	"menu.hint_font_gui",
-	"menu.hint_fonts",
 	"menu.hint_font_scaling",
 	"menu.hint_font_ttx",
+	"menu.hint_fonts",
 	"menu.hint_gamelist_fonts",
 	"menu.hint_games",
 	"menu.hint_hdd",
@@ -794,9 +795,9 @@ const char * locale_real_names[] =
 	"menu.hint_head_back",
 	"menu.hint_head_textcolor",
 	"menu.hint_imageinfo",
+	"menu.hint_inact_timer",
 	"menu.hint_inactive_back",
 	"menu.hint_inactive_textcolor",
-	"menu.hint_inact_timer",
 	"menu.hint_inet_radio",
 	"menu.hint_info",
 	"menu.hint_infobar_back",
@@ -822,9 +823,9 @@ const char * locale_real_names[] =
 	"menu.hint_key_bouquetdown",
 	"menu.hint_key_bouquetup",
 	"menu.hint_key_cancel",
+	"menu.hint_key_channel_sms",
 	"menu.hint_key_channeldown",
 	"menu.hint_key_channellist",
-	"menu.hint_key_channel_sms",
 	"menu.hint_key_channelup",
 	"menu.hint_key_hardware",
 	"menu.hint_key_history",
@@ -852,7 +853,6 @@ const char * locale_real_names[] =
 	"menu.hint_key_repeatblock",
 	"menu.hint_key_repeatblockgeneric",
 	"menu.hint_key_right",
-	"menu.hint_keys",
 	"menu.hint_key_save",
 	"menu.hint_key_screenshot",
 	"menu.hint_key_sort",
@@ -861,6 +861,7 @@ const char * locale_real_names[] =
 	"menu.hint_key_transponder",
 	"menu.hint_key_tvradiomode",
 	"menu.hint_key_unlock",
+	"menu.hint_keys",
 	"menu.hint_lang_pref",
 	"menu.hint_language",
 	"menu.hint_last_radio",
@@ -942,13 +943,12 @@ const char * locale_real_names[] =
 	"menu.hint_reboot",
 	"menu.hint_record_apid_ac3",
 	"menu.hint_record_apid_alt",
-	"menu.hint_record_apids",
 	"menu.hint_record_apid_std",
+	"menu.hint_record_apids",
 	"menu.hint_record_apply",
 	"menu.hint_record_chandir",
 	"menu.hint_record_dir",
 	"menu.hint_record_end",
-	"menu.hint_recording",
 	"menu.hint_record_tdir",
 	"menu.hint_record_time",
 	"menu.hint_record_timeafter",
@@ -961,14 +961,15 @@ const char * locale_real_names[] =
 	"menu.hint_record_timeshift_temp",
 	"menu.hint_record_zap",
 	"menu.hint_record_zap_pre_time",
+	"menu.hint_recording",
 	"menu.hint_reload_channels",
 	"menu.hint_reload_plugins",
 	"menu.hint_reset",
 	"menu.hint_restore",
 	"menu.hint_rotor_swap",
 	"menu.hint_rounded_corners",
-	"menu.hint_saveas",
 	"menu.hint_save_settings",
+	"menu.hint_saveas",
 	"menu.hint_scan_auto",
 	"menu.hint_scan_autoall",
 	"menu.hint_scan_autoall_select",
@@ -1000,8 +1001,8 @@ const char * locale_real_names[] =
 	"menu.hint_scan_longitude",
 	"menu.hint_scan_manual",
 	"menu.hint_scan_mod",
-	"menu.hint_scan_motorpos",
 	"menu.hint_scan_motor_speed",
+	"menu.hint_scan_motorpos",
 	"menu.hint_scan_nid",
 	"menu.hint_scan_nit",
 	"menu.hint_scan_pids",
@@ -1023,8 +1024,8 @@ const char * locale_real_names[] =
 	"menu.hint_scan_test",
 	"menu.hint_scan_tpselect",
 	"menu.hint_scan_uncommited",
-	"menu.hint_scan_usalsall",
 	"menu.hint_scan_usals_repeat",
+	"menu.hint_scan_usalsall",
 	"menu.hint_scan_useusals",
 	"menu.hint_scrambled_message",
 	"menu.hint_screen_setup",
@@ -1061,9 +1062,9 @@ const char * locale_real_names[] =
 	"menu.hint_tvradio_switch",
 	"menu.hint_vfd",
 	"menu.hint_vfd_brightness",
+	"menu.hint_vfd_brightness_setup",
 	"menu.hint_vfd_brightnessdeepstandby",
 	"menu.hint_vfd_brightnessdim",
-	"menu.hint_vfd_brightness_setup",
 	"menu.hint_vfd_brightnessstandby",
 	"menu.hint_vfd_defaults",
 	"menu.hint_vfd_dimtime",
@@ -1358,13 +1359,12 @@ const char * locale_real_names[] =
 	"nfs.dir",
 	"nfs.ip",
 	"nfs.localdir",
-	"nfsmenu.head",
 	"nfs.mount",
+	"nfs.mount_options",
 	"nfs.mounterror",
 	"nfs.mounterror_notsup",
 	"nfs.mountnow",
 	"nfs.mountok",
-	"nfs.mount_options",
 	"nfs.mounttimeout",
 	"nfs.password",
 	"nfs.remount",
@@ -1375,11 +1375,12 @@ const char * locale_real_names[] =
 	"nfs.umount",
 	"nfs.umounterror",
 	"nfs.username",
+	"nfsmenu.head",
 	"nvod.percentage",
+	"nvod.starting",
 	"nvodselector.directormode",
 	"nvodselector.head",
 	"nvodselector.subservice",
-	"nvod.starting",
 	"options.default",
 	"options.fb",
 	"options.ntp_off",
@@ -1427,9 +1428,9 @@ const char * locale_real_names[] =
 	"personalize.notprotected",
 	"personalize.notvisible",
 	"personalize.pin",
+	"personalize.pin_in_use",
 	"personalize.pincode",
 	"personalize.pinhint",
-	"personalize.pin_in_use",
 	"personalize.pinprotect",
 	"personalize.pinstatus",
 	"personalize.plugins",
@@ -1465,8 +1466,8 @@ const char * locale_real_names[] =
 	"pictureviewer.resize.simple",
 	"pictureviewer.scaling",
 	"pictureviewer.show",
-	"pictureviewer.slideshow",
 	"pictureviewer.slide_time",
+	"pictureviewer.slideshow",
 	"pictureviewer.sortorder.date",
 	"pictureviewer.sortorder.filename",
 	"ping.ok",
@@ -1483,6 +1484,8 @@ const char * locale_real_names[] =
 	"rclock.title",
 	"rclock.unlockmsg",
 	"recording.is_running",
+	"recording.start",
+	"recording.stop",
 	"recordingmenu.apids",
 	"recordingmenu.apids_ac3",
 	"recordingmenu.apids_alt",
@@ -1509,8 +1512,6 @@ const char * locale_real_names[] =
 	"recordingmenu.tsdir",
 	"recordingmenu.vcr",
 	"recordingmenu.zap_on_announce",
-	"recording.start",
-	"recording.stop",
 	"recordtimer.announce",
 	"repeatblocker.hint_1",
 	"repeatblocker.hint_2",
@@ -1530,8 +1531,8 @@ const char * locale_real_names[] =
 	"satsetup.diseqc_advanced",
 	"satsetup.diseqc_com_uncom",
 	"satsetup.diseqc_input",
-	"satsetup.diseqcrepeat",
 	"satsetup.diseqc_uncom_com",
+	"satsetup.diseqcrepeat",
 	"satsetup.extended",
 	"satsetup.extended_motor",
 	"satsetup.fastscan_all",
@@ -1559,8 +1560,8 @@ const char * locale_real_names[] =
 	"satsetup.motor_pos",
 	"satsetup.nodiseqc",
 	"satsetup.reset_numbers",
-	"satsetup.satellite",
 	"satsetup.sat_setup",
+	"satsetup.satellite",
 	"satsetup.select_sat",
 	"satsetup.smatvremote",
 	"satsetup.uncomm_input",
@@ -1569,6 +1570,14 @@ const char * locale_real_names[] =
 	"satsetup.use_fta_flag",
 	"satsetup.use_nit",
 	"satsetup.use_usals",
+	"sc.empty",
+	"sc.init_failed",
+	"sc.init_ok",
+	"sc.inserted",
+	"sc.removed",
+	"sc.reset",
+	"sc.timeout",
+	"sc.waiting",
 	"scants.abort_body",
 	"scants.abort_header",
 	"scants.actcable",
@@ -1595,10 +1604,6 @@ const char * locale_real_names[] =
 	"scants.startnow",
 	"scants.test",
 	"scants.transponders",
-	"sc.empty",
-	"sc.init_failed",
-	"sc.init_ok",
-	"sc.inserted",
 	"scrambled_channel",
 	"screensetup.lowerright",
 	"screensetup.upperleft",
@@ -1613,10 +1618,6 @@ const char * locale_real_names[] =
 	"screenshot.scale",
 	"screenshot.tv",
 	"screenshot.video",
-	"sc.removed",
-	"sc.reset",
-	"sc.timeout",
-	"sc.waiting",
 	"servicemenu.getplugins",
 	"servicemenu.getplugins_hint",
 	"servicemenu.head",
@@ -1669,12 +1670,12 @@ const char * locale_real_names[] =
 	"stringinput.clear",
 	"subtitles.head",
 	"subtitles.stop",
-	"timerbar.channelswitch",
-	"timerbar.recordevent",
 	"timer.eventrecord.msg",
 	"timer.eventrecord.title",
 	"timer.eventtimed.msg",
 	"timer.eventtimed.title",
+	"timerbar.channelswitch",
+	"timerbar.recordevent",
 	"timerlist.alarmtime",
 	"timerlist.apids",
 	"timerlist.apids_dflt",
@@ -1699,9 +1700,6 @@ const char * locale_real_names[] =
 	"timerlist.repeat",
 	"timerlist.repeat.biweekly",
 	"timerlist.repeat.byeventdescription",
-	"timerlist.repeatcount",
-	"timerlist.repeatcount.help1",
-	"timerlist.repeatcount.help2",
 	"timerlist.repeat.daily",
 	"timerlist.repeat.fourweekly",
 	"timerlist.repeat.friday",
@@ -1716,6 +1714,9 @@ const char * locale_real_names[] =
 	"timerlist.repeat.wednesday",
 	"timerlist.repeat.weekdays",
 	"timerlist.repeat.weekly",
+	"timerlist.repeatcount",
+	"timerlist.repeatcount.help1",
+	"timerlist.repeatcount.help2",
 	"timerlist.save",
 	"timerlist.standby",
 	"timerlist.standby.off",
@@ -1768,6 +1769,7 @@ const char * locale_real_names[] =
 	"usermenu.msg_warning_name",
 	"usermenu.msg_warning_no_items",
 	"usermenu.name",
+	"video_mode_ok",
 	"videomenu.43mode",
 	"videomenu.analog_hd_rgb_cinch",
 	"videomenu.analog_hd_rgb_scart",
@@ -1812,7 +1814,6 @@ const char * locale_real_names[] =
 	"videomenu.videoformat_169",
 	"videomenu.videoformat_43",
 	"videomenu.videomode",
-	"video_mode_ok",
 	"wizard.welcome_head",
 	"wizard.welcome_text",
 	"word.from",