diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 7323a86de..4830d2cf2 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -336,10 +336,6 @@ extra.cache_txt Teletext zwischenspeichern extra.chadded Der aktuelle Kanal wird dem selektierten Bouquet hinzugefügt...\n extra.chalreadyinbq Der aktuelle Kanal ist bereits im selektierten Bouquet...\n extra.clear_log Logdatei löschen -extra.colored_events Sendung farbig -extra.colored_events_0 keine -extra.colored_events_1 aktuelle -extra.colored_events_2 nächste extra.dboxinfo Box-Info extra.east Osten extra.fec_1_2 1/2 S1_QPSK @@ -755,6 +751,10 @@ miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Anzeige miscsettings.infobar_casystem_mini Mini miscsettings.infobar_casystem_mode Diskret +miscsettings.infobar_colored_events Sendung farbig +miscsettings.infobar_colored_events_0 keine +miscsettings.infobar_colored_events_1 aktuelle +miscsettings.infobar_colored_events_2 nächste miscsettings.infobar_disp_0 Kein Logo miscsettings.infobar_disp_1 Logo in der Nummernbox miscsettings.infobar_disp_2 Logo/Kanalnummer diff --git a/data/locale/english.locale b/data/locale/english.locale index 6ed8f8540..cf7afd1ed 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -336,10 +336,6 @@ extra.cache_txt Cache teletext extra.chadded The current channel has been added to selected bouquet....\n extra.chalreadyinbq The current channel is already in selected bouquet....\n extra.clear_log Clear Log -extra.colored_events Program colored -extra.colored_events_0 none -extra.colored_events_1 current -extra.colored_events_2 next extra.dboxinfo Box Info extra.east East extra.fec_1_2 1/2 @@ -755,6 +751,10 @@ miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Display miscsettings.infobar_casystem_mini mini miscsettings.infobar_casystem_mode discreet +miscsettings.infobar_colored_events Program colored +miscsettings.infobar_colored_events_0 none +miscsettings.infobar_colored_events_1 current +miscsettings.infobar_colored_events_2 next miscsettings.infobar_disp_0 without Logo miscsettings.infobar_disp_1 Logo 1 miscsettings.infobar_disp_2 Logo 2 diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 7447751bf..4166d6934 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -264,9 +264,9 @@ const CMenuOptionChooser::keyval CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS[CHANNE #define OPTIONS_COLORED_EVENTS_OPTION_COUNT 3 const CMenuOptionChooser::keyval OPTIONS_COLORED_EVENTS_OPTIONS[OPTIONS_COLORED_EVENTS_OPTION_COUNT] = { - { 0, LOCALE_EXTRA_COLORED_EVENTS_0 }, //none - { 1, LOCALE_EXTRA_COLORED_EVENTS_1 }, //current - { 2, LOCALE_EXTRA_COLORED_EVENTS_2 }, //next + { 0, LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_0 }, //none + { 1, LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_1 }, //current + { 2, LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_2 }, //next }; @@ -326,7 +326,6 @@ void COsdSetup::showOsdSetup() osd_menu->addItem(new CMenuOptionChooser(LOCALE_COLORMENU_FADE, &g_settings.widget_fade, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true )); osd_menu->addItem(new CMenuOptionChooser(LOCALE_EXTRA_BIGWINDOWS, &g_settings.big_windows, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); osd_menu->addItem(new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - osd_menu->addItem(new CMenuOptionChooser(LOCALE_EXTRA_COLORED_EVENTS, &g_settings.colored_events, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true)); osd_menu->exec(NULL, ""); osd_menu->hide(); @@ -383,7 +382,7 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) CColorChooser* chColored_Events = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.colored_events_red, &g_settings.colored_events_green, &g_settings.colored_events_blue, NULL, colorSetupNotifier); - menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_EXTRA_COLORED_EVENTS)); + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS)); menu_colors->addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chColored_Events )); } @@ -592,6 +591,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_VAR_HDD, &g_settings.infobar_show_var_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES, &g_settings.infobar_show_res, INFOBAR_SHOW_RES_MODE_OPTIONS, INFOBAR_SHOW_RES_MODE_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS, &g_settings.colored_events, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true)); // radiotextNotifier = new CRadiotextNotifier(); // menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, radiotextNotifier)); } diff --git a/src/system/locals.h b/src/system/locals.h index 8b2d791ef..e76256e31 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -363,10 +363,6 @@ typedef enum LOCALE_EXTRA_CHADDED, LOCALE_EXTRA_CHALREADYINBQ, LOCALE_EXTRA_CLEAR_LOG, - LOCALE_EXTRA_COLORED_EVENTS, - LOCALE_EXTRA_COLORED_EVENTS_0, - LOCALE_EXTRA_COLORED_EVENTS_1, - LOCALE_EXTRA_COLORED_EVENTS_2, LOCALE_EXTRA_DBOXINFO, LOCALE_EXTRA_EAST, LOCALE_EXTRA_FEC_1_2, @@ -782,6 +778,10 @@ typedef enum LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MINI, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE, + LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS, + LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_0, + LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_1, + LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_2, LOCALE_MISCSETTINGS_INFOBAR_DISP_0, LOCALE_MISCSETTINGS_INFOBAR_DISP_1, LOCALE_MISCSETTINGS_INFOBAR_DISP_2, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 19946c14a..80f7264ea 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -363,10 +363,6 @@ const char * locale_real_names[] = "extra.chadded", "extra.chalreadyinbq", "extra.clear_log", - "extra.colored_events", - "extra.colored_events_0", - "extra.colored_events_1", - "extra.colored_events_2", "extra.dboxinfo", "extra.east", "extra.fec_1_2", @@ -782,6 +778,10 @@ const char * locale_real_names[] = "miscsettings.infobar_casystem_display", "miscsettings.infobar_casystem_mini", "miscsettings.infobar_casystem_mode", + "miscsettings.infobar_colored_events", + "miscsettings.infobar_colored_events_0", + "miscsettings.infobar_colored_events_1", + "miscsettings.infobar_colored_events_2", "miscsettings.infobar_disp_0", "miscsettings.infobar_disp_1", "miscsettings.infobar_disp_2",