Merge branch 'master' into pu/mp

src/gui/osd_setup.cpp

@@ -280,11 +280,13 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 		CMenuOptionNumberChooser* mc = new CMenuOptionNumberChooser(LOCALE_FONTMENU_SCALING_X, &g_settings.font_scaling_x, true, 50, 200, this);
 		mc->setNumericInput(true);
 		mc->setNumberFormat("%d%%");
+		mc->setHint("", LOCALE_FONTMENU_SCALING_X_HINT2);
 		fontscale.addItem(mc);
 
 		mc = new CMenuOptionNumberChooser(LOCALE_FONTMENU_SCALING_Y, &g_settings.font_scaling_y, true, 50, 200, this);
 		mc->setNumericInput(true);
 		mc->setNumberFormat("%d%%");
+		mc->setHint("", LOCALE_FONTMENU_SCALING_Y_HINT2);
 		fontscale.addItem(mc);
 
 		res = fontscale.exec(NULL, "");

src/gui/widget/colorchooser.cpp

@@ -271,7 +271,7 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &)
 
 void CColorChooser::hide()
 {
-	frameBuffer->paintBackgroundBoxRel(x, y, width, height);
+	frameBuffer->paintBackgroundBoxRel(x, y, width + OFFSET_SHADOW, height + OFFSET_SHADOW);
 }
 
 void CColorChooser::paint()

src/gui/widget/keychooser.cpp

@@ -36,8 +36,8 @@ CKeyChooser::CKeyChooser(unsigned int * const Key, const neutrino_locale_t title
 	keyName = CRCInput::getKeyName(*key);
 
 	addIntroItems();
-	addItem(new CMenuDForwarder(LOCALE_KEYCHOOSERMENU_SETNEW, true, NULL, new CKeyChooserItem(LOCALE_KEYCHOOSER_HEAD, key)));
-	addItem(new CMenuDForwarder(LOCALE_KEYCHOOSERMENU_SETNONE, true, NULL, new CKeyChooserItemNoKey(key)));
+	addItem(new CMenuDForwarder(LOCALE_KEYCHOOSERMENU_SETNEW,  true, NULL, new CKeyChooserItem(key, LOCALE_KEYCHOOSER_HEAD)));
+	addItem(new CMenuDForwarder(LOCALE_KEYCHOOSERMENU_SETNONE, true, NULL, new CKeyRemoverItem(key)));
 	addItem(GenericMenuSeparatorLine);
 	addItem(new CMenuForwarder(LOCALE_KEYCHOOSERMENU_CURRENTKEY, false, keyName));
 }
@@ -52,12 +52,6 @@ void CKeyChooser::paint()
 	CMenuWidget::paint();
 }
 
-CKeyChooserItem::CKeyChooserItem(const neutrino_locale_t Name, unsigned int * Key)
-{
-	name = Name;
-	key = Key;
-}
-
 int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &)
 {
 	neutrino_msg_t      msg;
@@ -84,7 +78,7 @@ int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &)
 
 	timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
- get_Message:
+	get_Message:
 	g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
 
 	if (msg != CRCInput::RC_timeout)
@@ -101,3 +95,9 @@ int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &)
 	hintbox->hide();
 	return res;
 }
+
+int CKeyRemoverItem::exec(CMenuTarget* /*parent*/, const std::string &)
+{
+	*key = (unsigned int)CRCInput::RC_nokey;
+	return menu_return::RETURN_REPAINT;
+}

src/gui/widget/keychooser.h

@@ -47,29 +47,31 @@ class CKeyChooser : public CMenuWidget
 class CKeyChooserItem : public CMenuTarget
 {
 	private:
-		neutrino_locale_t name;
 		unsigned int *key;
-	public:
-		CKeyChooserItem(const neutrino_locale_t Name, unsigned int *Key);
+		neutrino_locale_t name;
 
-		int exec(CMenuTarget* parent, const std::string & actionKey);
+	public:
+		CKeyChooserItem(unsigned int *Key, const neutrino_locale_t Name)
+		{
+			key = Key;
+			name = Name;
+		}
+
+		int exec(CMenuTarget* parent, const std::string & /*actionKey*/);
 };
 
-class CKeyChooserItemNoKey : public CMenuTarget
+class CKeyRemoverItem : public CMenuTarget
 {
-	unsigned int *key;
+	private:
+		unsigned int *key;
+
 	public:
-		CKeyChooserItemNoKey(unsigned int *Key)
+		CKeyRemoverItem(unsigned int *Key)
 		{
 			key = Key;
 		};
 
-		int exec(CMenuTarget* /*parent*/, const std::string & /*actionKey*/)
-		{
-			*key = (unsigned int)CRCInput::RC_nokey;
-			return menu_return::RETURN_REPAINT;
-		}
+		int exec(CMenuTarget* parent, const std::string & /*actionKey*/);
 };
 
-
 #endif

src/system/locals.h

@@ -341,9 +341,6 @@ typedef enum
 	LOCALE_COLORCHOOSER_BLUE,
 	LOCALE_COLORCHOOSER_GREEN,
 	LOCALE_COLORCHOOSER_RED,
-	LOCALE_COLORCHOOSER_SAVE,
-	LOCALE_COLORMENU_ADVANCED_MODE_OFF,
-	LOCALE_COLORMENU_ADVANCED_MODE_ON,
 	LOCALE_COLORMENU_BACKGROUND,
 	LOCALE_COLORMENU_CLOCK_TEXTCOLOR,
 	LOCALE_COLORMENU_FADE,
@@ -478,7 +475,6 @@ typedef enum
 	LOCALE_EXTRA_KEY_PIP_CLOSE,
 	LOCALE_EXTRA_KEY_PIP_SETUP,
 	LOCALE_EXTRA_KEY_PIP_SWAP,
-	LOCALE_EXTRA_KEY_PLUGIN,
 	LOCALE_EXTRA_KEY_RECORD,
 	LOCALE_EXTRA_KEY_SCREENSHOT,
 	LOCALE_EXTRA_KEY_SWITCHFORMAT,
@@ -523,7 +519,6 @@ typedef enum
 	LOCALE_EXTRA_TP_DELSYS_DSS,
 	LOCALE_EXTRA_TP_DELSYS_DTMB,
 	LOCALE_EXTRA_TP_DELSYS_DVBC,
-	LOCALE_EXTRA_TP_DELSYS_DVBC2,
 	LOCALE_EXTRA_TP_DELSYS_DVBS,
 	LOCALE_EXTRA_TP_DELSYS_DVBS2,
 	LOCALE_EXTRA_TP_DELSYS_DVBT,
@@ -590,7 +585,6 @@ typedef enum
 	LOCALE_EXTRA_ZAP_CYCLE,
 	LOCALE_EXTRA_ZAPIT_FE_TIMEOUT,
 	LOCALE_EXTRA_ZAPIT_HVOLTAGE,
-	LOCALE_EXTRA_ZAPIT_MAKE_BOUQUET,
 	LOCALE_EXTRA_ZAPIT_MOTOR_SPEED,
 	LOCALE_EXTRA_ZAPIT_SCANPIDS,
 	LOCALE_EXTRA_ZAPIT_SDT_CHANGED,
@@ -661,7 +655,6 @@ typedef enum
 	LOCALE_FLASHUPDATE_GETINFOFILEERROR,
 	LOCALE_FLASHUPDATE_GETUPDATEFILE,
 	LOCALE_FLASHUPDATE_GETUPDATEFILEERROR,
-	LOCALE_FLASHUPDATE_GLOBALPROGRESS,
 	LOCALE_FLASHUPDATE_HEAD,
 	LOCALE_FLASHUPDATE_INSTALL_IMAGE,
 	LOCALE_FLASHUPDATE_INSTALL_PACKAGE,
@@ -673,7 +666,6 @@ typedef enum
 	LOCALE_FLASHUPDATE_MKFS_PREPARING_FILES,
 	LOCALE_FLASHUPDATE_MKFS_USING_SUMTOOL,
 	LOCALE_FLASHUPDATE_MSGBOX,
-	LOCALE_FLASHUPDATE_MSGBOX_MANUAL,
 	LOCALE_FLASHUPDATE_MTDSELECTOR,
 	LOCALE_FLASHUPDATE_NAMEMODE1,
 	LOCALE_FLASHUPDATE_NAMEMODE1_DEFAULT,
@@ -721,7 +713,6 @@ typedef enum
 	LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_ERROR,
 	LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_PROCESSED,
 	LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SKIPPED,
-	LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SUCCESSFULLY,
 	LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_WARNING,
 	LOCALE_FLASHUPDATE_UPDATEMODE,
 	LOCALE_FLASHUPDATE_UPDATEMODE_INTERNET,
@@ -795,14 +786,12 @@ typedef enum
 	LOCALE_HDD_ACTIVATE,
 	LOCALE_HDD_CHECK,
 	LOCALE_HDD_CHECK_FAILED,
-	LOCALE_HDD_CHECK_FORMAT_BAD,
 	LOCALE_HDD_EXTENDED_SETTINGS,
 	LOCALE_HDD_FAST,
 	LOCALE_HDD_FORMAT,
 	LOCALE_HDD_FORMAT_FAILED,
 	LOCALE_HDD_FORMAT_WARN,
 	LOCALE_HDD_FS,
-	LOCALE_HDD_FS_UNKNOWN,
 	LOCALE_HDD_MANAGE,
 	LOCALE_HDD_MIDDLE,
 	LOCALE_HDD_MOUNT,
@@ -811,7 +800,6 @@ typedef enum
 	LOCALE_HDD_MOUNT_UMOUNT,
 	LOCALE_HDD_NOISE,
 	LOCALE_HDD_NOT_FOUND,
-	LOCALE_HDD_REMOVABLE_DEVICE,
 	LOCALE_HDD_SET_RECDIR,
 	LOCALE_HDD_SETTINGS,
 	LOCALE_HDD_SLEEP,
@@ -844,13 +832,11 @@ typedef enum
 	LOCALE_INFOVIEWER_NOEPG,
 	LOCALE_INFOVIEWER_NOTAVAILABLE,
 	LOCALE_INFOVIEWER_NOW,
-	LOCALE_INFOVIEWER_SELECTTIME,
 	LOCALE_INFOVIEWER_SUBCHAN_DISP_POS,
 	LOCALE_INFOVIEWER_SUBCHAN_INFOBAR,
 	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,
@@ -997,7 +983,6 @@ typedef enum
 	LOCALE_MENU_HINT_A_PIC,
 	LOCALE_MENU_HINT_ADZAP,
 	LOCALE_MENU_HINT_ADZAP_ACTIVE,
-	LOCALE_MENU_HINT_ADZAP_SETUP,
 	LOCALE_MENU_HINT_ADZAP_WRITEDATA,
 	LOCALE_MENU_HINT_APLAY,
 	LOCALE_MENU_HINT_APLAY_SETUP,
@@ -1140,7 +1125,6 @@ typedef enum
 	LOCALE_MENU_HINT_KEEP_NUMBERS,
 	LOCALE_MENU_HINT_KEY_ADDRECORD,
 	LOCALE_MENU_HINT_KEY_ADDREMIND,
-	LOCALE_MENU_HINT_KEY_AUDIO,
 	LOCALE_MENU_HINT_KEY_BINDING,
 	LOCALE_MENU_HINT_KEY_BOUQUETDOWN,
 	LOCALE_MENU_HINT_KEY_BOUQUETUP,
@@ -1175,8 +1159,6 @@ typedef enum
 	LOCALE_MENU_HINT_KEY_PIC_SIZE_ACTIVE,
 	LOCALE_MENU_HINT_KEY_PIP_CLOSE,
 	LOCALE_MENU_HINT_KEY_PIP_SETUP,
-	LOCALE_MENU_HINT_KEY_PIP_SWAP,
-	LOCALE_MENU_HINT_KEY_PLUGIN,
 	LOCALE_MENU_HINT_KEY_POWEROFF,
 	LOCALE_MENU_HINT_KEY_QUICKZAP,
 	LOCALE_MENU_HINT_KEY_RECORD,
@@ -1596,7 +1578,6 @@ typedef enum
 	LOCALE_MISCSETTINGS_INFOCLOCK,
 	LOCALE_MISCSETTINGS_ONLINESERVICES,
 	LOCALE_MISCSETTINGS_PROGRESSBAR,
-	LOCALE_MISCSETTINGS_PROGRESSBAR_COLOR,
 	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN,
 	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_0,
 	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_1,
@@ -1707,7 +1688,6 @@ typedef enum
 	LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1,
 	LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2,
 	LOCALE_MOVIEBROWSER_EDIT_SERIE,
-	LOCALE_MOVIEBROWSER_ERROR_NO_MOVIES,
 	LOCALE_MOVIEBROWSER_FILTER_OFF,
 	LOCALE_MOVIEBROWSER_FOOT_FILTER,
 	LOCALE_MOVIEBROWSER_FOOT_FOCUS,
@@ -1777,7 +1757,6 @@ typedef enum
 	LOCALE_MOVIEBROWSER_MENU_CUT,
 	LOCALE_MOVIEBROWSER_MENU_CUT_HEAD,
 	LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD,
-	LOCALE_MOVIEBROWSER_MENU_HELP_HEAD,
 	LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS,
 	LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD,
 	LOCALE_MOVIEBROWSER_MENU_NFS_HEAD,
@@ -1844,7 +1823,6 @@ typedef enum
 	LOCALE_MOVIEBROWSER_YT_MAX_RESULTS,
 	LOCALE_MOVIEBROWSER_YT_MOST_POPULAR,
 	LOCALE_MOVIEBROWSER_YT_MOST_POPULAR_ALL_TIME,
-	LOCALE_MOVIEBROWSER_YT_NEXT_RESULTS,
 	LOCALE_MOVIEBROWSER_YT_ORDERBY,
 	LOCALE_MOVIEBROWSER_YT_ORDERBY_PUBLISHED,
 	LOCALE_MOVIEBROWSER_YT_ORDERBY_RATING,
@@ -1852,8 +1830,6 @@ typedef enum
 	LOCALE_MOVIEBROWSER_YT_ORDERBY_VIEWCOUNT,
 	LOCALE_MOVIEBROWSER_YT_PENDING,
 	LOCALE_MOVIEBROWSER_YT_PREF_QUALITY,
-	LOCALE_MOVIEBROWSER_YT_PREV_RESULTS,
-	LOCALE_MOVIEBROWSER_YT_RECENTLY_FEATURED,
 	LOCALE_MOVIEBROWSER_YT_REGION,
 	LOCALE_MOVIEBROWSER_YT_RELATED,
 	LOCALE_MOVIEBROWSER_YT_SEARCH,
@@ -2044,7 +2020,6 @@ typedef enum
 	LOCALE_PERSONALIZE_PINSTATUS,
 	LOCALE_PERSONALIZE_PLUGINS,
 	LOCALE_PERSONALIZE_USERMENU_PLUGIN_TYPES,
-	LOCALE_PERSONALIZE_USERMENU_PREFERRED_BUTTONS,
 	LOCALE_PERSONALIZE_USERMENU_SHOW_CANCEL,
 	LOCALE_PERSONALIZE_VISIBLE,
 	LOCALE_PICTUREVIEWER_DEFDIR,
@@ -2197,11 +2172,6 @@ typedef enum
 	LOCALE_SATSETUP_FASTSCAN_SD,
 	LOCALE_SATSETUP_FASTSCAN_TYPE,
 	LOCALE_SATSETUP_FASTSCAN_UPDATE,
-	LOCALE_SATSETUP_FE_DELSYS_MODE,
-	LOCALE_SATSETUP_FE_DELSYS_MODE_AUTO,
-	LOCALE_SATSETUP_FE_DELSYS_MODE_CABLE,
-	LOCALE_SATSETUP_FE_DELSYS_MODE_SAT,
-	LOCALE_SATSETUP_FE_DELSYS_MODE_TERRESTRIAL,
 	LOCALE_SATSETUP_FE_MODE,
 	LOCALE_SATSETUP_FE_MODE_INDEPENDENT,
 	LOCALE_SATSETUP_FE_MODE_LINK_LOOP,
@@ -2267,7 +2237,6 @@ typedef enum
 	LOCALE_SCANTS_NUMBEROFTOTALSERVICES,
 	LOCALE_SCANTS_NUMBEROFTVSERVICES,
 	LOCALE_SCANTS_PREVERENCES_RECEIVING_SYSTEM,
-	LOCALE_SCANTS_PREVERENCES_SCAN,
 	LOCALE_SCANTS_PROVIDER,
 	LOCALE_SCANTS_SELECT_TP,
 	LOCALE_SCANTS_STARTNOW,
@@ -2434,17 +2403,11 @@ typedef enum
 	LOCALE_TIMERLIST_WEEKDAYS_HINT_2,
 	LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS,
 	LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER,
-	LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER_HINT_1,
-	LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER_HINT_2,
 	LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_BEFORE,
-	LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_BEFORE_HINT_1,
-	LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_BEFORE_HINT_2,
 	LOCALE_TIMERSETTINGS_SEPARATOR,
 	LOCALE_TIMING_CHANLIST,
 	LOCALE_TIMING_EPG,
 	LOCALE_TIMING_FILEBROWSER,
-	LOCALE_TIMING_HINT_1,
-	LOCALE_TIMING_HINT_2,
 	LOCALE_TIMING_INFOBAR,
 	LOCALE_TIMING_INFOBAR_MOVIEPLAYER,
 	LOCALE_TIMING_INFOBAR_RADIO,
@@ -2484,7 +2447,6 @@ typedef enum
 	LOCALE_USERMENU_KEY,
 	LOCALE_USERMENU_KEY_SELECT,
 	LOCALE_USERMENU_MSG_INFO_IS_EMPTY,
-	LOCALE_USERMENU_MSG_WARNING_NAME,
 	LOCALE_USERMENU_MSG_WARNING_NO_ITEMS,
 	LOCALE_USERMENU_NAME,
 	LOCALE_USERMENU_TITLE_BLUE,
@@ -2540,8 +2502,6 @@ typedef enum
 	LOCALE_VIDEOMENU_SHARPNESS,
 	LOCALE_VIDEOMENU_TV_SCART,
 	LOCALE_VIDEOMENU_VCRSIGNAL,
-	LOCALE_VIDEOMENU_VCRSIGNAL_COMPOSITE,
-	LOCALE_VIDEOMENU_VCRSIGNAL_SVIDEO,
 	LOCALE_VIDEOMENU_VIDEOFORMAT,
 	LOCALE_VIDEOMENU_VIDEOFORMAT_149,
 	LOCALE_VIDEOMENU_VIDEOFORMAT_169,

src/system/locals_intern.h

@@ -341,9 +341,6 @@ const char * locale_real_names[] =
 	"colorchooser.blue",
 	"colorchooser.green",
 	"colorchooser.red",
-	"colorchooser.save",
-	"colormenu.advanced_mode_off",
-	"colormenu.advanced_mode_on",
 	"colormenu.background",
 	"colormenu.clock_textcolor",
 	"colormenu.fade",
@@ -478,7 +475,6 @@ const char * locale_real_names[] =
 	"extra.key_pip_close",
 	"extra.key_pip_setup",
 	"extra.key_pip_swap",
-	"extra.key_plugin",
 	"extra.key_record",
 	"extra.key_screenshot",
 	"extra.key_switchformat",
@@ -523,7 +519,6 @@ const char * locale_real_names[] =
 	"extra.tp_delsys_dss",
 	"extra.tp_delsys_dtmb",
 	"extra.tp_delsys_dvbc",
-	"extra.tp_delsys_dvbc2",
 	"extra.tp_delsys_dvbs",
 	"extra.tp_delsys_dvbs2",
 	"extra.tp_delsys_dvbt",
@@ -590,7 +585,6 @@ const char * locale_real_names[] =
 	"extra.zap_cycle",
 	"extra.zapit_fe_timeout",
 	"extra.zapit_hvoltage",
-	"extra.zapit_make_bouquet",
 	"extra.zapit_motor_speed",
 	"extra.zapit_scanpids",
 	"extra.zapit_sdt_changed",
@@ -661,7 +655,6 @@ const char * locale_real_names[] =
 	"flashupdate.getinfofileerror",
 	"flashupdate.getupdatefile",
 	"flashupdate.getupdatefileerror",
-	"flashupdate.globalprogress",
 	"flashupdate.head",
 	"flashupdate.install_image",
 	"flashupdate.install_package",
@@ -673,7 +666,6 @@ const char * locale_real_names[] =
 	"flashupdate.mkfs_preparing_files",
 	"flashupdate.mkfs_using_sumtool",
 	"flashupdate.msgbox",
-	"flashupdate.msgbox_manual",
 	"flashupdate.mtdselector",
 	"flashupdate.namemode1",
 	"flashupdate.namemode1_default",
@@ -721,7 +713,6 @@ const char * locale_real_names[] =
 	"flashupdate.update_with_settings_error",
 	"flashupdate.update_with_settings_processed",
 	"flashupdate.update_with_settings_skipped",
-	"flashupdate.update_with_settings_successfully",
 	"flashupdate.update_with_settings_warning",
 	"flashupdate.updatemode",
 	"flashupdate.updatemode_internet",
@@ -795,14 +786,12 @@ const char * locale_real_names[] =
 	"hdd_activate",
 	"hdd_check",
 	"hdd_check_failed",
-	"hdd_check_format_bad",
 	"hdd_extended_settings",
 	"hdd_fast",
 	"hdd_format",
 	"hdd_format_failed",
 	"hdd_format_warn",
 	"hdd_fs",
-	"hdd_fs_unknown",
 	"hdd_manage",
 	"hdd_middle",
 	"hdd_mount",
@@ -811,7 +800,6 @@ const char * locale_real_names[] =
 	"hdd_mount_umount",
 	"hdd_noise",
 	"hdd_not_found",
-	"hdd_removable_device",
 	"hdd_set_recdir",
 	"hdd_settings",
 	"hdd_sleep",
@@ -844,13 +832,11 @@ const char * locale_real_names[] =
 	"infoviewer.noepg",
 	"infoviewer.notavailable",
 	"infoviewer.now",
-	"infoviewer.selecttime",
 	"infoviewer.subchan_disp_pos",
 	"infoviewer.subchan_infobar",
 	"infoviewer.waittime",
 	"ipsetup.hint_1",
 	"ipsetup.hint_2",
-	"keybindingmenu.RC",
 	"keybindingmenu.addrecord",
 	"keybindingmenu.addremind",
 	"keybindingmenu.allchannels_on_ok",
@@ -997,7 +983,6 @@ const char * locale_real_names[] =
 	"menu.hint_a_pic",
 	"menu.hint_adzap",
 	"menu.hint_adzap_active",
-	"menu.hint_adzap_setup",
 	"menu.hint_adzap_writedata",
 	"menu.hint_aplay",
 	"menu.hint_aplay_setup",
@@ -1140,7 +1125,6 @@ const char * locale_real_names[] =
 	"menu.hint_keep_numbers",
 	"menu.hint_key_addrecord",
 	"menu.hint_key_addremind",
-	"menu.hint_key_audio",
 	"menu.hint_key_binding",
 	"menu.hint_key_bouquetdown",
 	"menu.hint_key_bouquetup",
@@ -1175,8 +1159,6 @@ const char * locale_real_names[] =
 	"menu.hint_key_pic_size_active",
 	"menu.hint_key_pip_close",
 	"menu.hint_key_pip_setup",
-	"menu.hint_key_pip_swap",
-	"menu.hint_key_plugin",
 	"menu.hint_key_poweroff",
 	"menu.hint_key_quickzap",
 	"menu.hint_key_record",
@@ -1596,7 +1578,6 @@ const char * locale_real_names[] =
 	"miscsettings.infoclock",
 	"miscsettings.onlineservices",
 	"miscsettings.progressbar",
-	"miscsettings.progressbar_color",
 	"miscsettings.progressbar_design",
 	"miscsettings.progressbar_design_0",
 	"miscsettings.progressbar_design_1",
@@ -1707,7 +1688,6 @@ const char * locale_real_names[] =
 	"moviebrowser.edit_book_type_info1",
 	"moviebrowser.edit_book_type_info2",
 	"moviebrowser.edit_serie",
-	"moviebrowser.error_no_movies",
 	"moviebrowser.filter_off",
 	"moviebrowser.foot_filter",
 	"moviebrowser.foot_focus",
@@ -1777,7 +1757,6 @@ const char * locale_real_names[] =
 	"moviebrowser.menu_cut",
 	"moviebrowser.menu_cut_head",
 	"moviebrowser.menu_directories_head",
-	"moviebrowser.menu_help_head",
 	"moviebrowser.menu_main_bookmarks",
 	"moviebrowser.menu_main_head",
 	"moviebrowser.menu_nfs_head",
@@ -1844,7 +1823,6 @@ const char * locale_real_names[] =
 	"moviebrowser.yt_max_results",
 	"moviebrowser.yt_most_popular",
 	"moviebrowser.yt_most_popular_all_time",
-	"moviebrowser.yt_next_results",
 	"moviebrowser.yt_orderby",
 	"moviebrowser.yt_orderby.published",
 	"moviebrowser.yt_orderby.rating",
@@ -1852,8 +1830,6 @@ const char * locale_real_names[] =
 	"moviebrowser.yt_orderby.viewcount",
 	"moviebrowser.yt_pending",
 	"moviebrowser.yt_pref_quality",
-	"moviebrowser.yt_prev_results",
-	"moviebrowser.yt_recently_featured",
 	"moviebrowser.yt_region",
 	"moviebrowser.yt_related",
 	"moviebrowser.yt_search",
@@ -2044,7 +2020,6 @@ const char * locale_real_names[] =
 	"personalize.pinstatus",
 	"personalize.plugins",
 	"personalize.usermenu_plugin_types",
-	"personalize.usermenu_preferred_buttons",
 	"personalize.usermenu_show_cancel",
 	"personalize.visible",
 	"pictureviewer.defdir",
@@ -2197,11 +2172,6 @@ const char * locale_real_names[] =
 	"satsetup.fastscan_sd",
 	"satsetup.fastscan_type",
 	"satsetup.fastscan_update",
-	"satsetup.fe_delsys_mode",
-	"satsetup.fe_delsys_mode_auto",
-	"satsetup.fe_delsys_mode_cable",
-	"satsetup.fe_delsys_mode_sat",
-	"satsetup.fe_delsys_mode_terrestrial",
 	"satsetup.fe_mode",
 	"satsetup.fe_mode_independent",
 	"satsetup.fe_mode_link_loop",
@@ -2267,7 +2237,6 @@ const char * locale_real_names[] =
 	"scants.numberoftotalservices",
 	"scants.numberoftvservices",
 	"scants.preverences_receiving_system",
-	"scants.preverences_scan",
 	"scants.provider",
 	"scants.select_tp",
 	"scants.startnow",
@@ -2434,17 +2403,11 @@ const char * locale_real_names[] =
 	"timerlist.weekdays.hint_2",
 	"timersettings.followscreenings",
 	"timersettings.record_safety_time_after",
-	"timersettings.record_safety_time_after.hint_1",
-	"timersettings.record_safety_time_after.hint_2",
 	"timersettings.record_safety_time_before",
-	"timersettings.record_safety_time_before.hint_1",
-	"timersettings.record_safety_time_before.hint_2",
 	"timersettings.separator",
 	"timing.chanlist",
 	"timing.epg",
 	"timing.filebrowser",
-	"timing.hint_1",
-	"timing.hint_2",
 	"timing.infobar",
 	"timing.infobar_movieplayer",
 	"timing.infobar_radio",
@@ -2484,7 +2447,6 @@ const char * locale_real_names[] =
 	"usermenu.key",
 	"usermenu.key_select",
 	"usermenu.msg_info_is_empty",
-	"usermenu.msg_warning_name",
 	"usermenu.msg_warning_no_items",
 	"usermenu.name",
 	"usermenu.title_blue",
@@ -2540,8 +2502,6 @@ const char * locale_real_names[] =
 	"videomenu.sharpness",
 	"videomenu.tv-scart",
 	"videomenu.vcrsignal",
-	"videomenu.vcrsignal_composite",
-	"videomenu.vcrsignal_svideo",
 	"videomenu.videoformat",
 	"videomenu.videoformat_149",
 	"videomenu.videoformat_169",