diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index b6be1056b..fbca5ddff 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -302,6 +302,7 @@ channellist.keep_numbers Dauerhafte Kanalnummern channellist.make_hdlist Erzeuge Bouquets mit HD- und UHD-Kanälen channellist.make_newlist Erzeuge Bouquet mit neuen Kanälen channellist.make_removedlist Erzeuge Bouquet mit gelöschten Kanälen +channellist.make_webradiolist Erzeuge Bouquet mit WebRadio-Kanälen channellist.make_webtvlist Erzeuge Bouquet mit WebTV-Kanälen channellist.new_zap_mode Quickzap in Liste channellist.new_zap_mode_active aktiv @@ -1544,6 +1545,7 @@ menu.hint_lua Plugins ausführen menu.hint_make_hdlist Bei aktiver Option werden Bouquets namens 'HD' und 'UHD' erzeugt, in denen alle HD- bzw. UHD-Sender zusammengefasst sind menu.hint_make_newlist Nach einer Kanalsuche wird ein Bouquet namens 'neue Kanäle' erzeugt menu.hint_make_removedlist Nach einer Kanalsuche wird ein Bouquet namens 'gelöschte Kanäle' erzeugt +menu.hint_make_webradiolist Bei aktiver Option wird ein Bouquet namens 'WebRadio' erzeugt, in dem alle WebRadio-Sender zusammengefasst sind menu.hint_make_webtvlist Bei aktiver Option wird ein Bouquet namens 'WebTV' erzeugt, in dem alle WebTV-Sender zusammengefasst sind menu.hint_manage_settings Sichern, Wiederherstellen und Auslieferungszustand wiederherstellen menu.hint_mb Ihre Aufnahmen diff --git a/data/locale/english.locale b/data/locale/english.locale index a5fe64f86..22b4e931c 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -302,6 +302,7 @@ channellist.keep_numbers Persistent channel numbers channellist.make_hdlist Create lists of HD and UHD channels channellist.make_newlist Create list of new channels channellist.make_removedlist Create list of removed channels +channellist.make_webradiolist Create list of WebRadio channels channellist.make_webtvlist Create list of WebTV channels channellist.new_zap_mode Quickzap in list channellist.new_zap_mode_active active @@ -1491,6 +1492,7 @@ menu.hint_lua Run Lua Plugins menu.hint_make_hdlist Auto-create HD and UHD channel lists based on\nchannel type and name menu.hint_make_newlist Create list of recently added channels menu.hint_make_removedlist Create list of recently removed channels +menu.hint_make_webradiolist Auto-create WebRadio channel list based on\nchannel type and name menu.hint_make_webtvlist Auto-create WebTV channel list based on\nchannel type and name menu.hint_manage_settings Backup, restore, revert to defaults\nFactory box reset menu.hint_mb Your recordings diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 689623efa..bb80dadf6 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -560,6 +560,7 @@ int CMiscMenue::showMiscSettingsMenuChanlist() bool make_hd_list = g_settings.make_hd_list; bool make_webtv_list = g_settings.make_webtv_list; + bool make_webradio_list = g_settings.make_webradio_list; bool show_empty_favorites = g_settings.show_empty_favorites; CMenuOptionChooser * mc; @@ -567,10 +568,14 @@ int CMiscMenue::showMiscSettingsMenuChanlist() mc->setHint("", LOCALE_MENU_HINT_MAKE_HDLIST); ms_chanlist->addItem(mc); - mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_WEBTVLIST , &g_settings.make_webtv_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_WEBTVLIST , &g_settings.make_webtv_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_MAKE_WEBTVLIST); ms_chanlist->addItem(mc); + mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_WEBRADIOLIST, &g_settings.make_webradio_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_MAKE_WEBRADIOLIST); + ms_chanlist->addItem(mc); + mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_NEWLIST, &g_settings.make_new_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_MAKE_NEWLIST); ms_chanlist->addItem(mc); @@ -605,7 +610,12 @@ int CMiscMenue::showMiscSettingsMenuChanlist() int res = ms_chanlist->exec(NULL, ""); delete ms_chanlist; - if (make_hd_list != g_settings.make_hd_list || make_webtv_list != g_settings.make_webtv_list || show_empty_favorites != g_settings.show_empty_favorites) + if ( + make_hd_list != g_settings.make_hd_list + || make_webtv_list != g_settings.make_webtv_list + || make_webradio_list != g_settings.make_webradio_list + || show_empty_favorites != g_settings.show_empty_favorites + ) g_RCInput->postMsg(NeutrinoMessages::EVT_SERVICESCHANGED, 0); return res; } diff --git a/src/system/locals.h b/src/system/locals.h index 716ab4863..31d219380 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -329,6 +329,7 @@ typedef enum LOCALE_CHANNELLIST_MAKE_HDLIST, LOCALE_CHANNELLIST_MAKE_NEWLIST, LOCALE_CHANNELLIST_MAKE_REMOVEDLIST, + LOCALE_CHANNELLIST_MAKE_WEBRADIOLIST, LOCALE_CHANNELLIST_MAKE_WEBTVLIST, LOCALE_CHANNELLIST_NEW_ZAP_MODE, LOCALE_CHANNELLIST_NEW_ZAP_MODE_ACTIVE, @@ -1571,6 +1572,7 @@ typedef enum LOCALE_MENU_HINT_MAKE_HDLIST, LOCALE_MENU_HINT_MAKE_NEWLIST, LOCALE_MENU_HINT_MAKE_REMOVEDLIST, + LOCALE_MENU_HINT_MAKE_WEBRADIOLIST, LOCALE_MENU_HINT_MAKE_WEBTVLIST, LOCALE_MENU_HINT_MANAGE_SETTINGS, LOCALE_MENU_HINT_MB, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 5aafc91ec..56ed2493b 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -329,6 +329,7 @@ const char * locale_real_names[] = "channellist.make_hdlist", "channellist.make_newlist", "channellist.make_removedlist", + "channellist.make_webradiolist", "channellist.make_webtvlist", "channellist.new_zap_mode", "channellist.new_zap_mode_active", @@ -1571,6 +1572,7 @@ const char * locale_real_names[] = "menu.hint_make_hdlist", "menu.hint_make_newlist", "menu.hint_make_removedlist", + "menu.hint_make_webradiolist", "menu.hint_make_webtvlist", "menu.hint_manage_settings", "menu.hint_mb",