Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e868c860a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)



------------------
This commit was generated by Migit

src/system/locals_intern.h

@@ -377,9 +377,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",
@@ -549,7 +546,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",
@@ -594,7 +590,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",
@@ -661,7 +656,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",
@@ -733,7 +727,6 @@ const char * locale_real_names[] =
 	"flashupdate.getinfofileerror",
 	"flashupdate.getupdatefile",
 	"flashupdate.getupdatefileerror",
-	"flashupdate.globalprogress",
 	"flashupdate.head",
 	"flashupdate.install_image",
 	"flashupdate.install_package",
@@ -745,7 +738,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",
@@ -794,7 +786,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",
@@ -870,7 +861,6 @@ const char * locale_real_names[] =
 	"hdd_allow_set_recdir",
 	"hdd_check",
 	"hdd_check_failed",
-	"hdd_check_format_bad",
 	"hdd_extended_settings",
 	"hdd_fast",
 	"hdd_format",
@@ -878,7 +868,6 @@ const char * locale_real_names[] =
 	"hdd_format_on_mount_failed",
 	"hdd_format_warn",
 	"hdd_fs",
-	"hdd_fs_unknown",
 	"hdd_info_capacity",
 	"hdd_info_firmware",
 	"hdd_info_head",
@@ -900,7 +889,6 @@ const char * locale_real_names[] =
 	"hdd_noise",
 	"hdd_not_found",
 	"hdd_power",
-	"hdd_removable_device",
 	"hdd_set_recdir",
 	"hdd_settings",
 	"hdd_sleep",
@@ -979,13 +967,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",
@@ -1147,7 +1133,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",
@@ -1322,7 +1307,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",
@@ -1357,8 +1341,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",
@@ -1807,7 +1789,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",
@@ -1918,7 +1899,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",
@@ -1989,7 +1969,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",
@@ -2056,7 +2035,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",
@@ -2064,8 +2042,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",
@@ -2284,7 +2260,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",
@@ -2445,11 +2420,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",
@@ -2515,7 +2485,6 @@ const char * locale_real_names[] =
 	"scants.numberoftotalservices",
 	"scants.numberoftvservices",
 	"scants.preverences_receiving_system",
-	"scants.preverences_scan",
 	"scants.provider",
 	"scants.select_tp",
 	"scants.startnow",
@@ -2695,17 +2664,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",
@@ -2746,7 +2709,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",
@@ -2802,8 +2764,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",