osd_progressbar_setup: rework locales; marginal changes in code

Origin commit data
------------------
Branch: ni/coolstream
Commit: 33c8526673
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
- osd_progressbar_setup: rework locales; marginal changes in code

------------------
No further description and justification available within origin commit message!

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

data/locale/deutsch.locale

@@ -803,9 +803,6 @@ menu.hint_infobar_fonts Ändern Sie die Schriftgrößen in der Infobar
 menu.hint_infobar_logo Logo- und Signal-Optionen
 menu.hint_infobar_logo_dir Wählen Sie das Verzeichnis für die Senderlogos
 menu.hint_infobar_on_epg Zeigt einen Hinweis bei EPG-Änderungen
-menu.hint_infobar_position Wählt die Optionen des Fortschrittsbalken in der Infobar
-menu.hint_infobar_progressbar Wählen sie die Optionen für die Progressbar-Anzeige
-menu.hint_infobar_progressbar_design Stellen Sie das Design des Fortschrittsbalkens ein
 menu.hint_infobar_radiotext Zeigt Radiotext in einen Fenster, wenn verfügbar
 menu.hint_infobar_res Zeige die gesendete Auflösung in Symbolen
 menu.hint_infobar_sat Zeigt die aktuellen Satelliten- oder Kabel-Provider
@@ -934,7 +931,10 @@ menu.hint_plugins_hdd_dir Auswahl des Verzeichnisses zum Laden der Plugins von e
 menu.hint_power_leds Konfiguriert das Verhalten der LEDs an der Power-Taste
 menu.hint_pref_lang Wählen Sie ihre bevorzugte Tonspur und EPG-Sprache,\ndie Einstellung 'none' deaktiviert diese Option
 menu.hint_pref_subs Wählen Sie ihre bevorzugte Untertitel-Sprache,\ndie Einstellung 'none' deaktiviert diese Option
+menu.hint_progressbar Wählen Sie die Optionen für die Fortschrittsbalken-Anzeige
 menu.hint_progressbar_color Bei aktivierter Option werden alle Fortschrittsbalken in Farbe und nicht im klassischen Weiß angezeigt
+menu.hint_progressbar_design Stellen Sie das Design des Fortschrittsbalkens ein
+menu.hint_progressbar_infobar_position Wählt die Optionen des Fortschrittsbalkens in der Infobar
 menu.hint_protection Schützen Sie Inhalte per PIN-Code\nStandard-PIN ist 0000
 menu.hint_radiomode Schaltet zum Radio-Modus
 menu.hint_reboot Startet die Box neu\nDer Neustart erfolgt ohne Bestätigung!
@@ -1138,17 +1138,18 @@ miscsettings.infobar_disp_5 Logo/Signalbalken
 miscsettings.infobar_disp_6 Logo+Kanalnummer/Signalbalken
 miscsettings.infobar_disp_log Logo
 miscsettings.infobar_logo_hdd_dir Logo-Verz.
-miscsettings.infobar_position Progessbarposition
+miscsettings.progressbar Fortschrittsbalken
-miscsettings.infobar_position_0 Standard
+miscsettings.progressbar_color Farbe
-miscsettings.infobar_position_1 unterhalb Kanalname
+miscsettings.progressbar_design Design
-miscsettings.infobar_position_2 unterhalb Kanalname (schmal)
+miscsettings.progressbar_design_0 Punkte
-miscsettings.infobar_position_3 zwischen EPG-Events (schmal)
+miscsettings.progressbar_design_1 vertikale Balken
-miscsettings.infobar_progressbar Fortschrittsbalken
+miscsettings.progressbar_design_2 horizontale Balken
-miscsettings.infobar_progressbar_design Progressbar
+miscsettings.progressbar_design_3 Farbverlauf
-miscsettings.infobar_progressbar_design_0 Punktdesign
+miscsettings.progressbar_infobar_position Position
-miscsettings.infobar_progressbar_design_1 Balkendesign Vertikal
+miscsettings.progressbar_infobar_position_0 Standard
-miscsettings.infobar_progressbar_design_2 Balkendesign Horizontal
+miscsettings.progressbar_infobar_position_1 unterhalb Kanalname
-miscsettings.infobar_progressbar_design_3 farbig
+miscsettings.progressbar_infobar_position_2 unterhalb Kanalname (schmal)
+miscsettings.progressbar_infobar_position_3 zwischen EPG-Events (schmal)
 miscsettings.infobar_sat_display Kabel-/Satellitenanbieter
 miscsettings.infobar_show Info bei EPG Änderungen
 miscsettings.infobar_show_dd_available DD-Verfügbarkeit anzeigen
@@ -1506,7 +1507,6 @@ pinprotection.head PIN-Abfrage
 pinprotection.wrongcode Geben Sie den Code nocheinmal ein!
 plugins.hdd_dir Externes Plugin-Verz.
 plugins.result Pluginausgabe
-progressbar.color Fortschrittsbalken Farbe
 rclock.lockmsg Die Fernbedienung der Coolstream wird gesperrt.\n Um die Sperre aufzuheben, bitte\n <ROT> und <MENU> auf der Fernbedienung\n drücken.
 rclock.menueadd FB sperren
 rclock.title Fernbedienung sperren

data/locale/english.locale

@@ -803,9 +803,6 @@ menu.hint_infobar_fonts Change infobar font sizes
 menu.hint_infobar_logo Logo / signal options
 menu.hint_infobar_logo_dir Select directory to search for channels logo
 menu.hint_infobar_on_epg Show infobar on current EPG event change
-menu.hint_infobar_position Selects the options of Progressbar in the Infobar
-menu.hint_infobar_progressbar Select the options for the Progressbar
-menu.hint_infobar_progressbar_design Here you can choose the design of the Progressbar with active color option.
 menu.hint_infobar_radiotext Show radiotext window
 menu.hint_infobar_res Show channel resolution icons
 menu.hint_infobar_sat Show current satellite or cable provider
@@ -934,7 +931,10 @@ menu.hint_plugins_hdd_dir Select directory to load\nplugins from
 menu.hint_power_leds Configure power-button LEDs behavior
 menu.hint_pref_lang Select preferred audio and EPG language\nselect 'none' to disable
 menu.hint_pref_subs Select preferred subtitle language\nselect 'none' to disable
-menu.hint_progressbar_color Show colored progress bars
+menu.hint_progressbar Select the options for the progressbar
+menu.hint_progressbar_color Show colored progressbar
+menu.hint_progressbar_design Here you can choose the design of progressbar with active color option
+menu.hint_progressbar_infobar_position Selects the options of progressbar in the infobar
 menu.hint_protection Protect content by PIN code\nDefault PIN 0000
 menu.hint_radiomode Switch box to radio mode
 menu.hint_reboot Reboot box\nNo confirmation
@@ -1138,17 +1138,18 @@ miscsettings.infobar_disp_5 Logo+signal
 miscsettings.infobar_disp_6 Logo+channel number+signal
 miscsettings.infobar_disp_log Logo
 miscsettings.infobar_logo_hdd_dir Logo dir
-miscsettings.infobar_position Progressbar Position
+miscsettings.progressbar Progressbar
-miscsettings.infobar_position_0 standard
+miscsettings.progressbar_color Color
-miscsettings.infobar_position_1 below channel name
+miscsettings.progressbar_design Design
-miscsettings.infobar_position_2 small below channel name
+miscsettings.progressbar_design_0 points
-miscsettings.infobar_position_3 narrow between EPG-Events
+miscsettings.progressbar_design_1 vertical bars
-miscsettings.infobar_progressbar Progressbar
+miscsettings.progressbar_design_2 horizontal bars
-miscsettings.infobar_progressbar_design Progressbar
+miscsettings.progressbar_design_3 colored
-miscsettings.infobar_progressbar_design_0 point Design
+miscsettings.progressbar_infobar_position Position
-miscsettings.infobar_progressbar_design_1 bar Design vertical
+miscsettings.progressbar_infobar_position_0 standard
-miscsettings.infobar_progressbar_design_2 bar Design horizontal
+miscsettings.progressbar_infobar_position_1 below channel name
-miscsettings.infobar_progressbar_design_3 colored
+miscsettings.progressbar_infobar_position_2 small below channel name
+miscsettings.progressbar_infobar_position_3 narrow between EPG-Events
 miscsettings.infobar_sat_display Satellite display on infobar
 miscsettings.infobar_show show Info on EPG change
 miscsettings.infobar_show_dd_available show DD availability
@@ -1506,7 +1507,6 @@ pinprotection.head Enter PIN code
 pinprotection.wrongcode PIN-Code was wrong! Try again.
 plugins.hdd_dir Plugin HDD dir.
 plugins.result plugin output
-progressbar.color Progressbar Color
 rclock.lockmsg Your box remote control will be locked.\n To unlock it, press <RED> \n and <MENU> on your remote control.
 rclock.menueadd Lock RC
 rclock.title Lock Remote Control

src/gui/osd_progressbar_setup.cpp

@@ -39,22 +39,22 @@
 
 #include <system/debug.h>
 
-#define LOCALE_MISCSETTINGS_INFOBAR_POSITION_COUNT 4
+#define PROGRESSBAR_INFOBAR_POSITION_COUNT 4
-const CMenuOptionChooser::keyval  LOCALE_MISCSETTINGS_INFOBAR_POSITION_OPTIONS[LOCALE_MISCSETTINGS_INFOBAR_POSITION_COUNT]=
+const CMenuOptionChooser::keyval PROGRESSBAR_INFOBAR_POSITION_OPTIONS[PROGRESSBAR_INFOBAR_POSITION_COUNT]=
 {
-   { 0 , LOCALE_MISCSETTINGS_INFOBAR_POSITION_0 },
+   { 0 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_0 },
-   { 1 , LOCALE_MISCSETTINGS_INFOBAR_POSITION_1 },
+   { 1 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_1 },
-   { 2 , LOCALE_MISCSETTINGS_INFOBAR_POSITION_2 },
+   { 2 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_2 },
-   { 3 , LOCALE_MISCSETTINGS_INFOBAR_POSITION_3 }
+   { 3 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_3 }
 };
 
-#define LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_COUNT 4
+#define PROGRESSBAR_DESIGN_COUNT 4
-const CMenuOptionChooser::keyval  LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_OPTIONS[LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_COUNT]=
+const CMenuOptionChooser::keyval PROGRESSBAR_DESIGN_OPTIONS[PROGRESSBAR_DESIGN_COUNT]=
 {
-   { 0 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_0 },
+   { 0 , LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_0 },
-   { 1 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_1 },
+   { 1 , LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_1 },
-   { 2 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_2 },
+   { 2 , LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_2 },
-   { 3 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_3 }
+   { 3 , LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3 }
 };
 
 CProgressbarSetup::CProgressbarSetup()
@@ -83,31 +83,32 @@ int CProgressbarSetup::showMenu()
 	CMenuWidget *progress = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_PROGRESSBAR);
 
 	//intros: back ande save
-	progress->addIntroItems(LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR);
+	progress->addIntroItems(LOCALE_MISCSETTINGS_PROGRESSBAR);
 
-	//infobar progresscolor on/off
 	COnOffNotifier* miscProgressNotifier = new COnOffNotifier(0);
 
-	CMenuOptionChooser *progresscolor;
+	//color on/off
-	progresscolor = new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, miscProgressNotifier);
+	CMenuOptionChooser *color;
-	progresscolor->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_COLOR);
+	color = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, miscProgressNotifier);
+	color->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_COLOR);
 
-	//infobar design
+	//design
-	CMenuOptionChooser *progressdesign = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN, &g_settings.progressbar_design, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_COUNT, g_settings.progressbar_color);
+	CMenuOptionChooser *design;
-	progressdesign->setHint("", LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR_DESIGN);
+	design = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN, &g_settings.progressbar_design, PROGRESSBAR_DESIGN_OPTIONS, PROGRESSBAR_DESIGN_COUNT, g_settings.progressbar_color);
+	design->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_DESIGN);
 
-	//infobar progressbarposition
+	//infobar position
-	CMenuOptionChooser *progressbarposition;
+	CMenuOptionChooser *infobar_position;
-	progressbarposition = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_POSITION, &g_settings.infobar_progressbar, LOCALE_MISCSETTINGS_INFOBAR_POSITION_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_POSITION_COUNT, true);
+	infobar_position = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION, &g_settings.infobar_progressbar, PROGRESSBAR_INFOBAR_POSITION_OPTIONS, PROGRESSBAR_INFOBAR_POSITION_COUNT, true);
-	progressbarposition->setHint("", LOCALE_MENU_HINT_INFOBAR_POSITION);
+	infobar_position->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_INFOBAR_POSITION);
 
-	miscProgressNotifier->addItem(progressdesign);
+	miscProgressNotifier->addItem(design);
 
 	//paint items
-	progress->addItem(progresscolor);
+	progress->addItem(color);
-	progress->addItem(progressdesign);
+	progress->addItem(design);
 	progress->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_INFOBAR));
-	progress->addItem(progressbarposition);
+	progress->addItem(infobar_position);
 
 	int res = progress->exec (NULL, "");
 	delete miscProgressNotifier;

src/gui/osd_setup.cpp

@@ -429,9 +429,9 @@ int COsdSetup::showOsdSetup()
 	osd_menu->addItem(mf);
 
 	//progressbar
-	CMenuForwarder * progress = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR, true, NULL, new CProgressbarSetup(), NULL, CRCInput::RC_1);
+	mf = new CMenuForwarder(LOCALE_MISCSETTINGS_PROGRESSBAR, true, NULL, new CProgressbarSetup(), NULL, CRCInput::RC_1);
-	progress->setHint("", LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR);
+	mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR);
-	osd_menu->addItem(progress);
+	osd_menu->addItem(mf);
 
 	//infobar
 	CMenuWidget osd_menu_infobar(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_INFOBAR);

src/system/locals.h

@@ -830,9 +830,6 @@ typedef enum
 	LOCALE_MENU_HINT_INFOBAR_LOGO,
 	LOCALE_MENU_HINT_INFOBAR_LOGO_DIR,
 	LOCALE_MENU_HINT_INFOBAR_ON_EPG,
-	LOCALE_MENU_HINT_INFOBAR_POSITION,
-	LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR,
-	LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR_DESIGN,
 	LOCALE_MENU_HINT_INFOBAR_RADIOTEXT,
 	LOCALE_MENU_HINT_INFOBAR_RES,
 	LOCALE_MENU_HINT_INFOBAR_SAT,
@@ -961,7 +958,10 @@ typedef enum
 	LOCALE_MENU_HINT_POWER_LEDS,
 	LOCALE_MENU_HINT_PREF_LANG,
 	LOCALE_MENU_HINT_PREF_SUBS,
+	LOCALE_MENU_HINT_PROGRESSBAR,
 	LOCALE_MENU_HINT_PROGRESSBAR_COLOR,
+	LOCALE_MENU_HINT_PROGRESSBAR_DESIGN,
+	LOCALE_MENU_HINT_PROGRESSBAR_INFOBAR_POSITION,
 	LOCALE_MENU_HINT_PROTECTION,
 	LOCALE_MENU_HINT_RADIOMODE,
 	LOCALE_MENU_HINT_REBOOT,
@@ -1165,17 +1165,6 @@ typedef enum
 	LOCALE_MISCSETTINGS_INFOBAR_DISP_6,
 	LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG,
 	LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR,
-	LOCALE_MISCSETTINGS_INFOBAR_POSITION,
-	LOCALE_MISCSETTINGS_INFOBAR_POSITION_0,
-	LOCALE_MISCSETTINGS_INFOBAR_POSITION_1,
-	LOCALE_MISCSETTINGS_INFOBAR_POSITION_2,
-	LOCALE_MISCSETTINGS_INFOBAR_POSITION_3,
-	LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR,
-	LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN,
-	LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_0,
-	LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_1,
-	LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_2,
-	LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_DESIGN_3,
 	LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY,
 	LOCALE_MISCSETTINGS_INFOBAR_SHOW,
 	LOCALE_MISCSETTINGS_INFOBAR_SHOW_DD_AVAILABLE,
@@ -1183,6 +1172,18 @@ typedef enum
 	LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES_SIMPLE,
 	LOCALE_MISCSETTINGS_INFOBAR_SHOW_SYSFS_HDD,
 	LOCALE_MISCSETTINGS_INFOBAR_SHOW_TUNER,
+	LOCALE_MISCSETTINGS_PROGRESSBAR,
+	LOCALE_MISCSETTINGS_PROGRESSBAR_COLOR,
+	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN,
+	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_0,
+	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_1,
+	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_2,
+	LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3,
+	LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION,
+	LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_0,
+	LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_1,
+	LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_2,
+	LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_3,
 	LOCALE_MISCSETTINGS_RADIOTEXT,
 	LOCALE_MISCSETTINGS_SHUTDOWN_COUNT,
 	LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT1,
@@ -1533,7 +1534,6 @@ typedef enum
 	LOCALE_PINPROTECTION_WRONGCODE,
 	LOCALE_PLUGINS_HDD_DIR,
 	LOCALE_PLUGINS_RESULT,
-	LOCALE_PROGRESSBAR_COLOR,
 	LOCALE_RCLOCK_LOCKMSG,
 	LOCALE_RCLOCK_MENUEADD,
 	LOCALE_RCLOCK_TITLE,

src/system/locals_intern.h

@@ -830,9 +830,6 @@ const char * locale_real_names[] =
 	"menu.hint_infobar_logo",
 	"menu.hint_infobar_logo_dir",
 	"menu.hint_infobar_on_epg",
-	"menu.hint_infobar_position",
-	"menu.hint_infobar_progressbar",
-	"menu.hint_infobar_progressbar_design",
 	"menu.hint_infobar_radiotext",
 	"menu.hint_infobar_res",
 	"menu.hint_infobar_sat",
@@ -961,7 +958,10 @@ const char * locale_real_names[] =
 	"menu.hint_power_leds",
 	"menu.hint_pref_lang",
 	"menu.hint_pref_subs",
+	"menu.hint_progressbar",
 	"menu.hint_progressbar_color",
+	"menu.hint_progressbar_design",
+	"menu.hint_progressbar_infobar_position",
 	"menu.hint_protection",
 	"menu.hint_radiomode",
 	"menu.hint_reboot",
@@ -1165,17 +1165,6 @@ const char * locale_real_names[] =
 	"miscsettings.infobar_disp_6",
 	"miscsettings.infobar_disp_log",
 	"miscsettings.infobar_logo_hdd_dir",
-	"miscsettings.infobar_position",
-	"miscsettings.infobar_position_0",
-	"miscsettings.infobar_position_1",
-	"miscsettings.infobar_position_2",
-	"miscsettings.infobar_position_3",
-	"miscsettings.infobar_progressbar",
-	"miscsettings.infobar_progressbar_design",
-	"miscsettings.infobar_progressbar_design_0",
-	"miscsettings.infobar_progressbar_design_1",
-	"miscsettings.infobar_progressbar_design_2",
-	"miscsettings.infobar_progressbar_design_3",
 	"miscsettings.infobar_sat_display",
 	"miscsettings.infobar_show",
 	"miscsettings.infobar_show_dd_available",
@@ -1183,6 +1172,18 @@ const char * locale_real_names[] =
 	"miscsettings.infobar_show_res_simple",
 	"miscsettings.infobar_show_sysfs_hdd",
 	"miscsettings.infobar_show_tuner",
+	"miscsettings.progressbar",
+	"miscsettings.progressbar_color",
+	"miscsettings.progressbar_design",
+	"miscsettings.progressbar_design_0",
+	"miscsettings.progressbar_design_1",
+	"miscsettings.progressbar_design_2",
+	"miscsettings.progressbar_design_3",
+	"miscsettings.progressbar_infobar_position",
+	"miscsettings.progressbar_infobar_position_0",
+	"miscsettings.progressbar_infobar_position_1",
+	"miscsettings.progressbar_infobar_position_2",
+	"miscsettings.progressbar_infobar_position_3",
 	"miscsettings.radiotext",
 	"miscsettings.shutdown_count",
 	"miscsettings.shutdown_count_hint1",
@@ -1533,7 +1534,6 @@ const char * locale_real_names[] =
 	"pinprotection.wrongcode",
 	"plugins.hdd_dir",
 	"plugins.result",
-	"progressbar.color",
 	"rclock.lockmsg",
 	"rclock.menueadd",
 	"rclock.title",