From b4bf491a461a19597756068a16a48932ccc741f3 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 12 Apr 2023 20:12:20 +0200 Subject: [PATCH] - locales: unify inetradio locales Conflicts: data/locale/deutsch.locale data/locale/english.locale src/system/locals.h src/system/locals_intern.h Signed-off-by: Thilo Graf --- data/locale/deutsch.locale | 4 ++-- data/locale/english.locale | 4 ++-- src/gui/audioplayer_setup.cpp | 2 +- src/gui/mediaplayer.cpp | 2 +- src/gui/user_menue.cpp | 2 +- src/gui/widget/icons.h | 2 +- src/system/locals.h | 4 ++-- src/system/locals_intern.h | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index c359c7fb9..5bd390db9 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1394,8 +1394,8 @@ menu.hint_imageinfo Informationen über die installierte Software menu.hint_inact_timer Ausschalten der Box nach Inaktivität in Minuten.\nDie Box geht automatisch in den Standby-Modus menu.hint_inactive_back Ändern Sie die Hintergrundfarbe für deaktivierte Fensterinhalte menu.hint_inactive_textcolor Ändern Sie die Textfarbe für deaktivierte Fensterinhalte -menu.hint_inet_radio Internetradio -menu.hint_inet_radio_autostart Spielt automatisch den ersten Eintrag der Favoriten-Liste ab +menu.hint_inetradio Internetradio +menu.hint_inetradio_autostart Spielt automatisch den ersten Eintrag der Favoriten-Liste ab menu.hint_info Systeminformationen anzeigen. menu.hint_infobar_back Ändern Sie die Hintergrundfarbe für die Infobar menu.hint_infobar_buttons_usertitle Erzwingt die benutzerdefinierten Titel der Farbtasten diff --git a/data/locale/english.locale b/data/locale/english.locale index ed20fe349..dec657a4c 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1394,8 +1394,8 @@ menu.hint_imageinfo Information about installed software menu.hint_inact_timer Shutdown box after inactivity menu.hint_inactive_back Change inactive item background color menu.hint_inactive_textcolor Change inactive item text color -menu.hint_inet_radio Internet radio -menu.hint_inet_radio_autostart Start play of first entry from favorites automatically +menu.hint_inetradio Internet radio +menu.hint_inetradio_autostart Start play of first entry from favorites automatically menu.hint_info Show system informations. menu.hint_infobar_back Change infobar background color menu.hint_infobar_buttons_usertitle Forces userdefined titles for the color keys diff --git a/src/gui/audioplayer_setup.cpp b/src/gui/audioplayer_setup.cpp index 339fcb3a7..f3ddfab00 100644 --- a/src/gui/audioplayer_setup.cpp +++ b/src/gui/audioplayer_setup.cpp @@ -153,7 +153,7 @@ int CAudioPlayerSetup::showAudioPlayerSetup() // internetradio autostart first entry from favorites mc = new CMenuOptionChooser(LOCALE_INETRADIO_AUTOSTART, &g_settings.inetradio_autostart, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL); - mc->setHint("", LOCALE_MENU_HINT_INET_RADIO_AUTOSTART); + mc->setHint("", LOCALE_MENU_HINT_INETRADIO_AUTOSTART); audioplayerSetup->addItem(mc); mc = new CMenuOptionChooser(LOCALE_AUDIOPLAYER_ENABLE_SC_METADATA, &g_settings.audioplayer_enable_sc_metadata, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true); diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp index 83c56866d..60faba874 100644 --- a/src/gui/mediaplayer.cpp +++ b/src/gui/mediaplayer.cpp @@ -147,7 +147,7 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) // internet player CMenuForwarder *fw_inet = new CMenuForwarder(LOCALE_INETRADIO_NAME, enabled, NULL, this, "inetplayer", CRCInput::RC_green); - fw_inet->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO); + fw_inet->setHint(NEUTRINO_ICON_HINT_INETRADIO, LOCALE_MENU_HINT_INETRADIO); personalize->addItem(multimedia_menu, fw_inet, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_INETPLAY]); // init movieplayer submenu diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index 495e4dfb5..de0741443 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -427,7 +427,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) { keyhelper.get(&key, &icon); menu_item = new CMenuForwarder(LOCALE_INETRADIO_NAME, true, NULL, neutrino, "inetplayer", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO); + menu_item->setHint(NEUTRINO_ICON_HINT_INETRADIO, LOCALE_MENU_HINT_INETRADIO); break; } case SNeutrinoSettings::ITEM_USER_MENU_29: diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 54ba8f81e..8de5ce17b 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -157,7 +157,7 @@ #define NEUTRINO_ICON_HINT_AVINPUTMODE "hint_avinputmode" #define NEUTRINO_ICON_HINT_AVINPUTMODE_PIP "hint_avinputmode_pip" #define NEUTRINO_ICON_HINT_QUADPIP "hint_quadpip" -#define NEUTRINO_ICON_HINT_INET_RADIO "hint_inetradio" +#define NEUTRINO_ICON_HINT_INETRADIO "hint_inetradio" #define NEUTRINO_ICON_HINT_MOVIE "hint_movie" #define NEUTRINO_ICON_HINT_PICVIEW "hint_picview" #define NEUTRINO_ICON_HINT_WEBRADIO "hint_webradio" diff --git a/src/system/locals.h b/src/system/locals.h index 6e65efb62..e38a7d0fd 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1422,8 +1422,8 @@ typedef enum LOCALE_MENU_HINT_INACT_TIMER, LOCALE_MENU_HINT_INACTIVE_BACK, LOCALE_MENU_HINT_INACTIVE_TEXTCOLOR, - LOCALE_MENU_HINT_INET_RADIO, - LOCALE_MENU_HINT_INET_RADIO_AUTOSTART, + LOCALE_MENU_HINT_INETRADIO, + LOCALE_MENU_HINT_INETRADIO_AUTOSTART, LOCALE_MENU_HINT_INFO, LOCALE_MENU_HINT_INFOBAR_BACK, LOCALE_MENU_HINT_INFOBAR_BUTTONS_USERTITLE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 227ddc5e9..cbbf8c3d1 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1422,8 +1422,8 @@ const char * locale_real_names[] = "menu.hint_inact_timer", "menu.hint_inactive_back", "menu.hint_inactive_textcolor", - "menu.hint_inet_radio", - "menu.hint_inet_radio_autostart", + "menu.hint_inetradio", + "menu.hint_inetradio_autostart", "menu.hint_info", "menu.hint_infobar_back", "menu.hint_infobar_buttons_usertitle",