#286, 288, 285, 242, 282, 296, 293

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@549 e54a6e83-5905-42d5-8d5c-058d10e6a962

src/system/locals.h

@@ -435,6 +435,7 @@ typedef enum {
 	LOCALE_INFOVIEWER_SELECTTIME,
 	LOCALE_INFOVIEWER_STREAMINFO,
 	LOCALE_INFOVIEWER_SUBCHAN_DISP_POS,
+	LOCALE_INFOVIEWER_SUBCHAN_INFOBAR,
 	LOCALE_INFOVIEWER_SUBSERVICE,
 	LOCALE_INFOVIEWER_WAITTIME,
 	LOCALE_IPSETUP_HINT_1,
@@ -515,6 +516,7 @@ typedef enum {
 	LOCALE_MAINSETTINGS_LANGUAGE,
 	LOCALE_MAINSETTINGS_TIMEZONE,
 	LOCALE_MAINSETTINGS_LCD,
+	LOCALE_MAINSETTINGS_MANAGE,
 	LOCALE_MAINSETTINGS_MISC,
 	LOCALE_MAINSETTINGS_NETWORK,
 	LOCALE_MAINSETTINGS_RECORDING,
@@ -607,6 +609,7 @@ typedef enum {
 	LOCALE_MOTORCONTROL_MSEC,
 	LOCALE_MOTORCONTROL_STATUS,
 	LOCALE_MOTORCONTROL_SAT_POS,
+	LOCALE_MOTORCONTROL_OVERRIDE,
 	LOCALE_MOVIEBROWSER_OPTION_BROWSER,
 	LOCALE_MOVIEBROWSER_BOOK_CLEAR_ALL,
 	LOCALE_MOVIEBROWSER_MENU_SAVE,

src/system/locals_intern.h

@@ -435,6 +435,7 @@ const char *locale_real_names[] = {
 	"infoviewer.selecttime",
 	"infoviewer.streaminfo",
 	"infoviewer.subchan_disp_pos",
+	"infoviewer.subchan_infobar",
 	"infoviewer.subservice",
 	"infoviewer.waittime",
 	"ipsetup.hint_1",
@@ -515,6 +516,7 @@ const char *locale_real_names[] = {
 	"mainsettings.language",
 	"mainsettings.timezone",
 	"mainsettings.lcd",
+	"mainsettings.manage",
 	"mainsettings.misc",
 	"mainsettings.network",
 	"mainsettings.recording",
@@ -607,6 +609,7 @@ const char *locale_real_names[] = {
 	"motorcontrol.msec",
 	"motorcontrol.status",
 	"motorcontrol.sat_pos",
+	"motorcontrol.override",
 	"moviebrowser.option_browser",
 	"moviebrowser.book_clear_all",
 	"moviebrowser.menu_save",

src/system/setting_helpers.cpp

@@ -901,8 +901,8 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void * Data)
                 while (search) {
                         if (!strcmp(xmlGetName(search), "zone")) {
 				name = xmlGetAttribute(search, "name");
-				zone = xmlGetAttribute(search, "zone");
 				if(!strcmp(g_settings.timezone, name.c_str())) {
+					zone = xmlGetAttribute(search, "zone");
 					found = true;
 					break;
 				}

src/system/settings.h

@@ -51,6 +51,7 @@ struct SNeutrinoSettings
 	unsigned char video_csync;
 	char current_volume;
 	int channel_mode;
+	int channel_mode_radio;
 
 	//misc
 	int shutdown_real;