Merge remote-tracking branch 'check/cst-next'

Conflicts: src/daemonc/remotecontrol.cpp src/gui/luainstance.cpp src/gui/movieplayer.cpp src/gui/videosettings.cpp src/neutrino.cpp src/system/setting_helpers.cpp src/zapit/src/zapit.cpp Origin commit data ------------------ Branch: ni/coolstream Commit: d37b3c0f9a Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de> Date: 2014-12-28 (Sun, 28 Dec 2014) ------------------ This commit was generated by Migit
2025-09-02 18:31:12 +02:00 · 2014-12-28 12:32:12 +01:00
parent c8d0f6faaf 85fc0dd24c
commit 770e405c50
112 changed files with 2783 additions and 928 deletions
--- a/src/system/flashtool.cpp
+++ b/src/system/flashtool.cpp
@@ -206,7 +206,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
 		CFileHelpers fh;
 		printf("##### [CFlashTool::program] copy flashfile to %s\n", flashfile.c_str());
 		if(statusViewer)
-			statusViewer->showStatusMessageUTF("Copy Image");
+			statusViewer->showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_COPY_IMAGE));
 		fh.copyFile(filename.c_str(), flashfile.c_str(), 0644);
 		sync();
 		if(statusViewer)
--- a/src/system/hddstat.cpp
+++ b/src/system/hddstat.cpp
@@ -41,10 +41,10 @@
 #include <driver/record.h>
 #include <driver/display.h>

-static cHddStat *instance = NULL;
-
 cHddStat *cHddStat::getInstance(void)
 {
+	static cHddStat *instance = NULL;
+
 	if (!instance)
 		instance = new cHddStat;
 	return instance;
--- a/src/system/helpers.cpp
+++ b/src/system/helpers.cpp
@@ -126,6 +126,7 @@ int my_system(int argc, const char *arg, ...)
 		if (i == argv_max)
 		{
 			fprintf(stderr, "my_system: too many arguments!\n");
+			va_end(args);
 			return -1;
 		}
 		argv[i] = va_arg(args, const char *);
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -155,6 +155,10 @@ typedef enum
 	LOCALE_AUDIOMENU_SPDIF_DD,
 	LOCALE_AUDIOMENU_STEREO,
 	LOCALE_AUDIOMENU_VOLUME_ADJUST,
+	LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT,
+	LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_AC3,
+	LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_CLEAR,
+	LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_PCM,
 	LOCALE_AUDIOMENU_VOLUME_START,
 	LOCALE_AUDIOMENU_VOLUME_STEP,
 	LOCALE_AUDIOPLAYER_ADD,
@@ -215,6 +219,7 @@ typedef enum
 	LOCALE_BOUQUETEDITOR_HIDE,
 	LOCALE_BOUQUETEDITOR_LOCK,
 	LOCALE_BOUQUETEDITOR_MOVE,
+	LOCALE_BOUQUETEDITOR_MOVE_TO,
 	LOCALE_BOUQUETEDITOR_NAME,
 	LOCALE_BOUQUETEDITOR_NEWBOUQUETNAME,
 	LOCALE_BOUQUETEDITOR_RENAME,
@@ -277,6 +282,7 @@ typedef enum
 	LOCALE_CHANNELLIST_SATS,
 	LOCALE_CHANNELLIST_SHOW_CHANNELLOGO,
 	LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER,
+	LOCALE_CHANNELLIST_SHOW_EMPTY_FAVS,
 	LOCALE_CHANNELLIST_SINCE,
 	LOCALE_CHANNELLIST_START,
 	LOCALE_CI_CLOCK,
@@ -514,6 +520,9 @@ typedef enum
 	LOCALE_EXTRA_TP_MOD_64,
 	LOCALE_EXTRA_TP_MOD_8,
 	LOCALE_EXTRA_TP_MOD_AUTO,
+	LOCALE_EXTRA_TP_PILOT,
+	LOCALE_EXTRA_TP_PILOT_AUTO,
+	LOCALE_EXTRA_TP_PILOT_AUTO_SW,
 	LOCALE_EXTRA_TP_POL,
 	LOCALE_EXTRA_TP_POL_H,
 	LOCALE_EXTRA_TP_POL_L,
@@ -553,6 +562,7 @@ typedef enum
 	LOCALE_FAVORITES_FINALHINT,
 	LOCALE_FAVORITES_MENUEADD,
 	LOCALE_FAVORITES_NOBOUQUETS,
+	LOCALE_FILEBROWSER_ADD,
 	LOCALE_FILEBROWSER_DELETE,
 	LOCALE_FILEBROWSER_DENYDIRECTORYLEAVE,
 	LOCALE_FILEBROWSER_DODELETE1,
@@ -562,6 +572,7 @@ typedef enum
 	LOCALE_FILEBROWSER_HEAD,
 	LOCALE_FILEBROWSER_MARK,
 	LOCALE_FILEBROWSER_NEXTPAGE,
+	LOCALE_FILEBROWSER_PM,
 	LOCALE_FILEBROWSER_PREVPAGE,
 	LOCALE_FILEBROWSER_SCAN,
 	LOCALE_FILEBROWSER_SELECT,
@@ -581,6 +592,7 @@ typedef enum
 	LOCALE_FLASHUPDATE_CANTOPENMTD,
 	LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET,
 	LOCALE_FLASHUPDATE_CHECKUPDATE_LOCAL,
+	LOCALE_FLASHUPDATE_COPY_IMAGE,
 	LOCALE_FLASHUPDATE_CREATEIMAGE,
 	LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_ENV,
 	LOCALE_FLASHUPDATE_CREATEIMAGE_ADD_KERNEL,
@@ -903,7 +915,11 @@ typedef enum
 	LOCALE_MENU_CANCEL,
 	LOCALE_MENU_HINT_A_PIC,
 	LOCALE_MENU_HINT_APLAY,
+	LOCALE_MENU_HINT_APLAY_SETUP,
 	LOCALE_MENU_HINT_AUDIO,
+	LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_AC3,
+	LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_CLEAR,
+	LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_PCM,
 	LOCALE_MENU_HINT_AUDIO_ANALOG_MODE,
 	LOCALE_MENU_HINT_AUDIO_AVSYNC,
 	LOCALE_MENU_HINT_AUDIO_DD,
@@ -947,6 +963,7 @@ typedef enum
 	LOCALE_MENU_HINT_CHANNELLIST_SETUP,
 	LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO,
 	LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER,
+	LOCALE_MENU_HINT_CHANNELLIST_SHOW_EMPTY_FAVS,
 	LOCALE_MENU_HINT_CHANNELS,
 	LOCALE_MENU_HINT_CI,
 	LOCALE_MENU_HINT_CLOCK_BACKGROUND,
@@ -968,7 +985,9 @@ typedef enum
 	LOCALE_MENU_HINT_EPG_FONTS,
 	LOCALE_MENU_HINT_EPG_MAX_EVENTS,
 	LOCALE_MENU_HINT_EPG_OLD_EVENTS,
+	LOCALE_MENU_HINT_EPG_READ,
 	LOCALE_MENU_HINT_EPG_SAVE,
+	LOCALE_MENU_HINT_EPG_SAVE_FREQUENTLY,
 	LOCALE_MENU_HINT_EPG_SAVE_STANDBY,
 	LOCALE_MENU_HINT_EPG_SCAN,
 	LOCALE_MENU_HINT_EPG_SCAN_MODE,
@@ -1113,6 +1132,7 @@ typedef enum
 	LOCALE_MENU_HINT_MISC_GENERAL,
 	LOCALE_MENU_HINT_MISC_ZAPIT,
 	LOCALE_MENU_HINT_MOVIE,
+	LOCALE_MENU_HINT_MOVIEBROWSER_SETUP,
 	LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN,
 	LOCALE_MENU_HINT_NET_BROADCAST,
 	LOCALE_MENU_HINT_NET_DHCP,
@@ -1164,6 +1184,7 @@ typedef enum
 	LOCALE_MENU_HINT_PERSONALIZE,
 	LOCALE_MENU_HINT_PICTUREVIEWER_DEFDIR,
 	LOCALE_MENU_HINT_PICTUREVIEWER_SCALING,
+	LOCALE_MENU_HINT_PICTUREVIEWER_SETUP,
 	LOCALE_MENU_HINT_PICTUREVIEWER_SLIDE_TIME,
 	LOCALE_MENU_HINT_PICVIEW,
 	LOCALE_MENU_HINT_PLUGIN_TYPE_GAMES,
@@ -1227,6 +1248,7 @@ typedef enum
 	LOCALE_MENU_HINT_SCAN_AUTOALL,
 	LOCALE_MENU_HINT_SCAN_AUTOALL_SELECT,
 	LOCALE_MENU_HINT_SCAN_BOUQUET,
+	LOCALE_MENU_HINT_SCAN_BOUQUET_WRITENAMES,
 	LOCALE_MENU_HINT_SCAN_BW,
 	LOCALE_MENU_HINT_SCAN_CABLE,
 	LOCALE_MENU_HINT_SCAN_CABLE_SIMPLE,
@@ -1269,6 +1291,7 @@ typedef enum
 	LOCALE_MENU_HINT_SCAN_NID,
 	LOCALE_MENU_HINT_SCAN_NIT,
 	LOCALE_MENU_HINT_SCAN_PIDS,
+	LOCALE_MENU_HINT_SCAN_PILOT,
 	LOCALE_MENU_HINT_SCAN_POL,
 	LOCALE_MENU_HINT_SCAN_RATE,
 	LOCALE_MENU_HINT_SCAN_RESET_NUMBERS,
@@ -1358,6 +1381,7 @@ typedef enum
 	LOCALE_MENU_HINT_VIDEO_FORMAT,
 	LOCALE_MENU_HINT_VIDEO_MODE,
 	LOCALE_MENU_HINT_VIDEO_MODES,
+	LOCALE_MENU_HINT_VIDEO_MODES_AUTO,
 	LOCALE_MENU_HINT_VIDEO_PIP,
 	LOCALE_MENU_HINT_VIDEO_SATURATION,
 	LOCALE_MENU_HINT_VIDEO_SCART_MODE,
@@ -1369,6 +1393,7 @@ typedef enum
 	LOCALE_MENU_HINT_WEBTV_SETUP,
 	LOCALE_MENU_HINT_WINDOW_SIZE,
 	LOCALE_MENU_HINT_YTPLAY,
+	LOCALE_MENU_HINT_YTPLAY_SETUP,
 	LOCALE_MENU_HINT_ZAP_CYCLE,
 	LOCALE_MENU_NEXT,
 	LOCALE_MESSAGEBOX_BACK,
@@ -1400,7 +1425,9 @@ typedef enum
 	LOCALE_MISCSETTINGS_EPG_OLD_EVENTS,
 	LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT1,
 	LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT2,
+	LOCALE_MISCSETTINGS_EPG_READ,
 	LOCALE_MISCSETTINGS_EPG_SAVE,
+	LOCALE_MISCSETTINGS_EPG_SAVE_FREQUENTLY,
 	LOCALE_MISCSETTINGS_EPG_SAVE_STANDBY,
 	LOCALE_MISCSETTINGS_EPG_SCAN,
 	LOCALE_MISCSETTINGS_EPG_SCAN_ALWAYS,
@@ -1512,6 +1539,7 @@ typedef enum
 	LOCALE_MOVIEBROWSER_BOOK_MOVIESTART,
 	LOCALE_MOVIEBROWSER_BOOK_NAME,
 	LOCALE_MOVIEBROWSER_BOOK_NEW,
+	LOCALE_MOVIEBROWSER_BOOK_NO_END,
 	LOCALE_MOVIEBROWSER_BOOK_POSITION,
 	LOCALE_MOVIEBROWSER_BOOK_TYPE,
 	LOCALE_MOVIEBROWSER_BOOK_TYPE_BACKWARD,
@@ -1522,7 +1550,15 @@ typedef enum
 	LOCALE_MOVIEBROWSER_BROWSER_ROW_NR,
 	LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,
 	LOCALE_MOVIEBROWSER_CACHE_DIR,
+	LOCALE_MOVIEBROWSER_COPIES,
+	LOCALE_MOVIEBROWSER_COPY,
+	LOCALE_MOVIEBROWSER_COPY_FAILED,
+	LOCALE_MOVIEBROWSER_COPYING,
+	LOCALE_MOVIEBROWSER_CUT,
+	LOCALE_MOVIEBROWSER_CUT_FAILED,
+	LOCALE_MOVIEBROWSER_CUTTING,
 	LOCALE_MOVIEBROWSER_DELETE_INFO,
+	LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT,
 	LOCALE_MOVIEBROWSER_DIR,
 	LOCALE_MOVIEBROWSER_DIR_HEAD,
 	LOCALE_MOVIEBROWSER_EDIT_BOOK,
@@ -1559,6 +1595,7 @@ typedef enum
 	LOCALE_MOVIEBROWSER_INFO_HEAD,
 	LOCALE_MOVIEBROWSER_INFO_HEAD_UPDATE,
 	LOCALE_MOVIEBROWSER_INFO_INFO1,
+	LOCALE_MOVIEBROWSER_INFO_INFO2,
 	LOCALE_MOVIEBROWSER_INFO_LENGTH,
 	LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE,
 	LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_0YEAR,
@@ -1622,6 +1659,10 @@ typedef enum
 	LOCALE_MOVIEBROWSER_SHORT_TITLE,
 	LOCALE_MOVIEBROWSER_START_HEAD,
 	LOCALE_MOVIEBROWSER_START_RECORD_START,
+	LOCALE_MOVIEBROWSER_TRUNCATE,
+	LOCALE_MOVIEBROWSER_TRUNCATE_FAILED,
+	LOCALE_MOVIEBROWSER_TRUNCATE_FAILED_PLAYING,
+	LOCALE_MOVIEBROWSER_TRUNCATING,
 	LOCALE_MOVIEBROWSER_TS_ONLY,
 	LOCALE_MOVIEBROWSER_UPDATE_IF_DEST_EMPTY_ONLY,
 	LOCALE_MOVIEBROWSER_USE_DIR,
@@ -1795,6 +1836,7 @@ typedef enum
 	LOCALE_PARENTALLOCK_ONSIGNAL,
 	LOCALE_PARENTALLOCK_PARENTALLOCK,
 	LOCALE_PARENTALLOCK_PROMPT,
+	LOCALE_PARENTALLOCK_ZAPTIME,
 	LOCALE_PERSONALIZE_ACCESS,
 	LOCALE_PERSONALIZE_APPLY_SETTINGS,
 	LOCALE_PERSONALIZE_BUTTON_AUTO,
@@ -2019,6 +2061,11 @@ typedef enum
 	LOCALE_SCANTS_BOUQUET_LEAVE,
 	LOCALE_SCANTS_BOUQUET_SATELLITE,
 	LOCALE_SCANTS_BOUQUET_UPDATE,
+	LOCALE_SCANTS_BOUQUET_WRITENAMES,
+	LOCALE_SCANTS_BOUQUET_WRITENAMES_BOUQUETS,
+	LOCALE_SCANTS_BOUQUET_WRITENAMES_EVER,
+	LOCALE_SCANTS_BOUQUET_WRITENAMES_NEVER,
+	LOCALE_SCANTS_BOUQUET_WRITENAMES_UBOUQUETS,
 	LOCALE_SCANTS_CHANNEL,
 	LOCALE_SCANTS_FAILED,
 	LOCALE_SCANTS_FINISHED,
@@ -2103,8 +2150,12 @@ typedef enum
 	LOCALE_STREAMING_OVERFLOW,
 	LOCALE_STREAMING_SLOW,
 	LOCALE_STREAMING_WRITE_ERROR,
+	LOCALE_STRINGINPUT_BACKSPACE,
 	LOCALE_STRINGINPUT_CAPS,
 	LOCALE_STRINGINPUT_CLEAR,
+	LOCALE_STRINGINPUT_INSERT,
+	LOCALE_STRINGINPUT_LAYOUT,
+	LOCALE_STRINGINPUT_SAVE,
 	LOCALE_SUBTITLES_CHARSET,
 	LOCALE_SUBTITLES_HEAD,
 	LOCALE_SUBTITLES_STOP,
@@ -2250,6 +2301,7 @@ typedef enum
 	LOCALE_VIDEOMENU_DBDR_DEBLOCK,
 	LOCALE_VIDEOMENU_DBDR_NONE,
 	LOCALE_VIDEOMENU_ENABLED_MODES,
+	LOCALE_VIDEOMENU_ENABLED_MODES_AUTO,
 	LOCALE_VIDEOMENU_FULLSCREEN,
 	LOCALE_VIDEOMENU_HDMI_CEC,
 	LOCALE_VIDEOMENU_HDMI_CEC_MODE,
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -155,6 +155,10 @@ const char * locale_real_names[] =
 	"audiomenu.spdif_dd",
 	"audiomenu.stereo",
 	"audiomenu.volume_adjust",
+	"audiomenu.volume_adjustment",
+	"audiomenu.volume_adjustment_ac3",
+	"audiomenu.volume_adjustment_clear",
+	"audiomenu.volume_adjustment_pcm",
 	"audiomenu.volume_start",
 	"audiomenu.volume_step",
 	"audioplayer.add",
@@ -215,6 +219,7 @@ const char * locale_real_names[] =
 	"bouqueteditor.hide",
 	"bouqueteditor.lock",
 	"bouqueteditor.move",
+	"bouqueteditor.move_to",
 	"bouqueteditor.name",
 	"bouqueteditor.newbouquetname",
 	"bouqueteditor.rename",
@@ -277,6 +282,7 @@ const char * locale_real_names[] =
 	"channellist.sats",
 	"channellist.show_channellogo",
 	"channellist.show_channelnumber",
+	"channellist.show_empty_favs",
 	"channellist.since",
 	"channellist.start",
 	"ci.clock",
@@ -514,6 +520,9 @@ const char * locale_real_names[] =
 	"extra.tp_mod_64",
 	"extra.tp_mod_8",
 	"extra.tp_mod_auto",
+	"extra.tp_pilot",
+	"extra.tp_pilot_auto",
+	"extra.tp_pilot_auto_sw",
 	"extra.tp_pol",
 	"extra.tp_pol_h",
 	"extra.tp_pol_l",
@@ -553,6 +562,7 @@ const char * locale_real_names[] =
 	"favorites.finalhint",
 	"favorites.menueadd",
 	"favorites.nobouquets",
+	"filebrowser.add",
 	"filebrowser.delete",
 	"filebrowser.denydirectoryleave",
 	"filebrowser.dodelete1",
@@ -562,6 +572,7 @@ const char * locale_real_names[] =
 	"filebrowser.head",
 	"filebrowser.mark",
 	"filebrowser.nextpage",
+	"filebrowser.pm",
 	"filebrowser.prevpage",
 	"filebrowser.scan",
 	"filebrowser.select",
@@ -581,6 +592,7 @@ const char * locale_real_names[] =
 	"flashupdate.cantopenmtd",
 	"flashupdate.checkupdate_internet",
 	"flashupdate.checkupdate_local",
+	"flashupdate.copy_image",
 	"flashupdate.createimage",
 	"flashupdate.createimage_add_env",
 	"flashupdate.createimage_add_kernel",
@@ -903,7 +915,11 @@ const char * locale_real_names[] =
 	"menu.cancel",
 	"menu.hint_a_pic",
 	"menu.hint_aplay",
+	"menu.hint_aplay_setup",
 	"menu.hint_audio",
+	"menu.hint_audio_adjust_vol_ac3",
+	"menu.hint_audio_adjust_vol_clear",
+	"menu.hint_audio_adjust_vol_pcm",
 	"menu.hint_audio_analog_mode",
 	"menu.hint_audio_avsync",
 	"menu.hint_audio_dd",
@@ -947,6 +963,7 @@ const char * locale_real_names[] =
 	"menu.hint_channellist_setup",
 	"menu.hint_channellist_show_channellogo",
 	"menu.hint_channellist_show_channelnumber",
+	"menu.hint_channellist_show_empty_favs",
 	"menu.hint_channels",
 	"menu.hint_ci",
 	"menu.hint_clock_background",
@@ -968,7 +985,9 @@ const char * locale_real_names[] =
 	"menu.hint_epg_fonts",
 	"menu.hint_epg_max_events",
 	"menu.hint_epg_old_events",
+	"menu.hint_epg_read",
 	"menu.hint_epg_save",
+	"menu.hint_epg_save_frequently",
 	"menu.hint_epg_save_standby",
 	"menu.hint_epg_scan",
 	"menu.hint_epg_scan_mode",
@@ -1113,6 +1132,7 @@ const char * locale_real_names[] =
 	"menu.hint_misc_general",
 	"menu.hint_misc_zapit",
 	"menu.hint_movie",
+	"menu.hint_moviebrowser_setup",
 	"menu.hint_movieplayer_plugin",
 	"menu.hint_net_broadcast",
 	"menu.hint_net_dhcp",
@@ -1164,6 +1184,7 @@ const char * locale_real_names[] =
 	"menu.hint_personalize",
 	"menu.hint_pictureviewer_defdir",
 	"menu.hint_pictureviewer_scaling",
+	"menu.hint_pictureviewer_setup",
 	"menu.hint_pictureviewer_slide_time",
 	"menu.hint_picview",
 	"menu.hint_plugin_type_games",
@@ -1227,6 +1248,7 @@ const char * locale_real_names[] =
 	"menu.hint_scan_autoall",
 	"menu.hint_scan_autoall_select",
 	"menu.hint_scan_bouquet",
+	"menu.hint_scan_bouquet_writenames",
 	"menu.hint_scan_bw",
 	"menu.hint_scan_cable",
 	"menu.hint_scan_cable_simple",
@@ -1269,6 +1291,7 @@ const char * locale_real_names[] =
 	"menu.hint_scan_nid",
 	"menu.hint_scan_nit",
 	"menu.hint_scan_pids",
+	"menu.hint_scan_pilot",
 	"menu.hint_scan_pol",
 	"menu.hint_scan_rate",
 	"menu.hint_scan_reset_numbers",
@@ -1358,6 +1381,7 @@ const char * locale_real_names[] =
 	"menu.hint_video_format",
 	"menu.hint_video_mode",
 	"menu.hint_video_modes",
+	"menu.hint_video_modes_auto",
 	"menu.hint_video_pip",
 	"menu.hint_video_saturation",
 	"menu.hint_video_scart_mode",
@@ -1369,6 +1393,7 @@ const char * locale_real_names[] =
 	"menu.hint_webtv_setup",
 	"menu.hint_window_size",
 	"menu.hint_ytplay",
+	"menu.hint_ytplay_setup",
 	"menu.hint_zap_cycle",
 	"menu.next",
 	"messagebox.back",
@@ -1400,7 +1425,9 @@ const char * locale_real_names[] =
 	"miscsettings.epg_old_events",
 	"miscsettings.epg_old_events_hint1",
 	"miscsettings.epg_old_events_hint2",
+	"miscsettings.epg_read",
 	"miscsettings.epg_save",
+	"miscsettings.epg_save_frequently",
 	"miscsettings.epg_save_standby",
 	"miscsettings.epg_scan",
 	"miscsettings.epg_scan_always",
@@ -1512,6 +1539,7 @@ const char * locale_real_names[] =
 	"moviebrowser.book_moviestart",
 	"moviebrowser.book_name",
 	"moviebrowser.book_new",
+	"moviebrowser.book_no_end",
 	"moviebrowser.book_position",
 	"moviebrowser.book_type",
 	"moviebrowser.book_type_backward",
@@ -1522,7 +1550,15 @@ const char * locale_real_names[] =
 	"moviebrowser.browser_row_nr",
 	"moviebrowser.browser_row_width",
 	"moviebrowser.cache_dir",
+	"moviebrowser.copies",
+	"moviebrowser.copy",
+	"moviebrowser.copy_failed",
+	"moviebrowser.copying",
+	"moviebrowser.cut",
+	"moviebrowser.cut_failed",
+	"moviebrowser.cutting",
 	"moviebrowser.delete_info",
+	"moviebrowser.delete_screenshot",
 	"moviebrowser.dir",
 	"moviebrowser.dir_head",
 	"moviebrowser.edit_book",
@@ -1559,6 +1595,7 @@ const char * locale_real_names[] =
 	"moviebrowser.info_head",
 	"moviebrowser.info_head_update",
 	"moviebrowser.info_info1",
+	"moviebrowser.info_info2",
 	"moviebrowser.info_length",
 	"moviebrowser.info_parental_lockage",
 	"moviebrowser.info_parental_lockage_0year",
@@ -1622,6 +1659,10 @@ const char * locale_real_names[] =
 	"moviebrowser.short_title",
 	"moviebrowser.start_head",
 	"moviebrowser.start_record_start",
+	"moviebrowser.truncate",
+	"moviebrowser.truncate_failed",
+	"moviebrowser.truncate_failed_playing",
+	"moviebrowser.truncating",
 	"moviebrowser.ts_only",
 	"moviebrowser.update_if_dest_empty_only",
 	"moviebrowser.use_dir",
@@ -1795,6 +1836,7 @@ const char * locale_real_names[] =
 	"parentallock.onsignal",
 	"parentallock.parentallock",
 	"parentallock.prompt",
+	"parentallock.zaptime",
 	"personalize.access",
 	"personalize.apply_settings",
 	"personalize.button_auto",
@@ -2019,6 +2061,11 @@ const char * locale_real_names[] =
 	"scants.bouquet_leave",
 	"scants.bouquet_satellite",
 	"scants.bouquet_update",
+	"scants.bouquet_writenames",
+	"scants.bouquet_writenames_bouquets",
+	"scants.bouquet_writenames_ever",
+	"scants.bouquet_writenames_never",
+	"scants.bouquet_writenames_ubouquets",
 	"scants.channel",
 	"scants.failed",
 	"scants.finished",
@@ -2103,8 +2150,12 @@ const char * locale_real_names[] =
 	"streaming.overflow",
 	"streaming.slow",
 	"streaming.write_error",
+	"stringinput.backspace",
 	"stringinput.caps",
 	"stringinput.clear",
+	"stringinput.insert",
+	"stringinput.layout",
+	"stringinput.save",
 	"subtitles.charset",
 	"subtitles.head",
 	"subtitles.stop",
@@ -2250,6 +2301,7 @@ const char * locale_real_names[] =
 	"videomenu.dbdr_deblock",
 	"videomenu.dbdr_none",
 	"videomenu.enabled_modes",
+	"videomenu.enabled_modes_auto",
 	"videomenu.fullscreen",
 	"videomenu.hdmi_cec",
 	"videomenu.hdmi_cec_mode",
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -369,29 +369,6 @@ int CNVODChangeExec::exec(CMenuTarget* parent, const std::string & actionKey)
 	return menu_return::RETURN_EXIT;
 }

-int CPluginsExec::exec(CMenuTarget* parent, const std::string & actionKey)
-{
-	//printf("CPluginsExec exec: %s\n", actionKey.c_str());
-	int sel= atoi(actionKey.c_str());
-
-	if(parent != NULL)
-		parent->hide();
-
-	if(actionKey == "teletext") {
-		g_RCInput->postMsg(CRCInput::RC_timeout, 0);
-		g_RCInput->postMsg(CRCInput::RC_text, 0);
-	}
-	else if (sel>=0)
-	{
-		g_PluginList->startPlugin(sel);
-	}
-
-	if (g_PluginList->getIntegration(sel) == CPlugins::I_TYPE_DISABLED)
-		return menu_return::RETURN_EXIT;
-
-	return menu_return::RETURN_REPAINT;
-}
-
 int CMoviePluginChangeExec::exec(CMenuTarget* parent, const std::string & actionKey)
 {
 	int sel= atoi(actionKey.c_str());
@@ -635,7 +612,11 @@ bool CAutoModeNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, voi
 					i, VIDEOMENU_VIDEOMODE_OPTIONS[i].key, VIDEO_STD_MAX);
 			continue;
 		}
+#ifdef BOXMODEL_APOLLO
+		modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_auto_modes[i];
+#else
 		modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_video_modes[i];
+#endif
 	}
 	videoDecoder->SetAutoModes(modes);
 	return false;
--- a/src/system/setting_helpers.h
+++ b/src/system/setting_helpers.h
@@ -115,12 +115,6 @@ class CNVODChangeExec : public CMenuTarget
 		int exec(CMenuTarget* parent, const std::string & actionKey);
 };

-class CPluginsExec : public CMenuTarget
-{
-	public:
-		int exec(CMenuTarget* parent, const std::string & actionKey);
-};
-
 class CMoviePluginChangeExec : public CMenuTarget
 {
 	public:
--- a/src/system/settings.cpp
+++ b/src/system/settings.cpp
@@ -145,6 +145,7 @@ bool CScanSettings::loadSettings(const char * const fileName)
 	sat_TP_rate = configfile.getString("sat_TP_rate", "27500000");
 	sat_TP_mod = configfile.getInt32("sat_TP_mod", QPSK);
 	sat_TP_delsys = configfile.getInt32("sat_TP_delsys", DVB_S);
+	sat_TP_pilot = configfile.getInt32("sat_TP_pilot", ZPILOT_AUTO_SW);

 	cableName     = configfile.getString("cableName", cableName);
 	cable_TP_mod  = configfile.getInt32("cable_TP_mod", QAM_64);
@@ -202,6 +203,7 @@ bool CScanSettings::saveSettings(const char * const fileName)
 	configfile.setString("sat_TP_rate", sat_TP_rate);
 	configfile.setInt32("sat_TP_delsys", sat_TP_delsys);
 	configfile.setInt32("sat_TP_mod", sat_TP_mod);
+	configfile.setInt32("sat_TP_pilot", sat_TP_pilot);

 	configfile.setString("cableName", cableName);
 	configfile.setInt32("cable_TP_fec", cable_TP_fec);
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -184,12 +184,16 @@ struct SNeutrinoSettings
 	int hdmi_dd;
 	int spdif_dd;
 	int analog_out;
+	int audio_volume_percent_ac3;
+	int audio_volume_percent_pcm;
+
 	//video
 	int video_dbdr;
 	int hdmi_cec_mode;
 	int hdmi_cec_view_on;
 	int hdmi_cec_standby;
 	int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
+	int enabled_auto_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
 	int cpufreq;
 	int standby_cpufreq;
 	int make_hd_list;
@@ -197,6 +201,7 @@ struct SNeutrinoSettings
 	int make_new_list;
 	int make_removed_list;
 	int keep_channel_numbers;
+	int show_empty_favorites;
 	int avsync;
 	int clockrec;
 	int rounded_corners;
@@ -220,6 +225,8 @@ struct SNeutrinoSettings
 	// EPG
 	int epg_save;
 	int epg_save_standby;
+	int epg_save_frequently;
+	int epg_read;
 	int epg_cache;
 	int epg_old_events;
 	int epg_max_events;
@@ -572,6 +579,7 @@ struct SNeutrinoSettings
 	int parentallock_prompt;
 	int parentallock_lockage;
 	int parentallock_defaultlocked;
+	int parentallock_zaptime;
 	std::string parentallock_pincode;


@@ -843,6 +851,7 @@ class CScanSettings
 		std::string	sat_TP_rate;
 		int		sat_TP_delsys;
 		int		sat_TP_mod;
+		int		sat_TP_pilot;

 		std::string	cableName;
 		int		cable_TP_mod;