diff --git a/config.def.h b/config.def.h index 4bb0d307fc..cc15759785 100644 --- a/config.def.h +++ b/config.def.h @@ -264,13 +264,29 @@ static bool menu_show_configurations = true; static bool menu_show_help = true; static bool menu_show_quit_retroarch = true; static bool menu_show_reboot = true; - #if defined(HAVE_LAKKA) || defined(VITA) || defined(_3DS) static bool menu_show_core_updater = false; #else static bool menu_show_core_updater = true; #endif +static bool content_show_settings = true; +static bool content_show_favorites = true; +#ifdef HAVE_IMAGEVIEWER +static bool content_show_images = true; +#endif +static bool content_show_music = true; +#ifdef HAVE_FFMPEG +static bool content_show_video = true; +#endif +#ifdef HAVE_NETWORKING +static bool content_show_netplay = true; +#endif +static bool content_show_history = true; +#ifdef HAVE_LIBRETRODB +static bool content_show_add = true; +#endif + #ifdef HAVE_XMB static unsigned xmb_scale_factor = 100; static unsigned xmb_alpha_factor = 75; @@ -284,22 +300,6 @@ static bool xmb_shadows_enable = false; #else static bool xmb_shadows_enable = true; #endif -static bool xmb_show_settings = true; -static bool xmb_show_favorites = true; -#ifdef HAVE_IMAGEVIEWER -static bool xmb_show_images = true; -#endif -static bool xmb_show_music = true; -#ifdef HAVE_FFMPEG -static bool xmb_show_video = true; -#endif -#ifdef HAVE_NETWORKING -static bool xmb_show_netplay = true; -#endif -static bool xmb_show_history = true; -#ifdef HAVE_LIBRETRODB -static bool xmb_show_add = true; -#endif #endif static bool automatically_add_content_to_playlist = false; diff --git a/configuration.c b/configuration.c index f03759c4cc..e1ccd1ba5b 100644 --- a/configuration.c +++ b/configuration.c @@ -1030,8 +1030,8 @@ static struct config_path_setting *populate_settings_path(settings_t *settings, /* Paths */ #ifdef HAVE_XMB SETTING_PATH("xmb_font", settings->paths.path_menu_xmb_font, false, NULL, true); - SETTING_PATH("xmb_show_settings_password", settings->paths.menu_xmb_show_settings_password, false, NULL, true); #endif + SETTING_PATH("content_show_settings_password", settings->paths.menu_content_show_settings_password, false, NULL, true); SETTING_PATH("kiosk_mode_password", settings->paths.kiosk_mode_password, false, NULL, true); SETTING_PATH("netplay_nickname", settings->paths.username, false, NULL, true); SETTING_PATH("video_filter", settings->paths.path_softfilter_plugin, false, NULL, true); @@ -1247,17 +1247,22 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("quick_menu_show_save_game_overrides", &settings->bools.quick_menu_show_save_game_overrides, true, quick_menu_show_save_game_overrides, false); SETTING_BOOL("quick_menu_show_information", &settings->bools.quick_menu_show_information, true, quick_menu_show_information, false); SETTING_BOOL("kiosk_mode_enable", &settings->bools.kiosk_mode_enable, true, kiosk_mode_enable, false); -#ifdef HAVE_MATERIALUI - SETTING_BOOL("materialui_icons_enable", &settings->bools.menu_materialui_icons_enable, true, materialui_icons_enable, false); -#endif -#ifdef HAVE_XMB - SETTING_BOOL("xmb_shadows_enable", &settings->bools.menu_xmb_shadows_enable, true, xmb_shadows_enable, false); - SETTING_BOOL("xmb_show_settings", &settings->bools.menu_xmb_show_settings, true, xmb_show_settings, false); - SETTING_BOOL("xmb_show_favorites", &settings->bools.menu_xmb_show_favorites, true, xmb_show_favorites, false); + SETTING_BOOL("content_show_settings", &settings->bools.menu_content_show_settings, true, content_show_settings, false); + SETTING_BOOL("content_show_favorites", &settings->bools.menu_content_show_favorites, true, content_show_favorites, false); #ifdef HAVE_IMAGEVIEWER - SETTING_BOOL("xmb_show_images", &settings->bools.menu_xmb_show_images, true, xmb_show_images, false); + SETTING_BOOL("content_show_images", &settings->bools.menu_content_show_images, true, content_show_images, false); +#endif + SETTING_BOOL("content_show_music", &settings->bools.menu_content_show_music, true, content_show_music, false); +#ifdef HAVE_FFMPEG + SETTING_BOOL("content_show_video", &settings->bools.menu_content_show_video, true, content_show_video, false); +#endif +#ifdef HAVE_NETWORKING + SETTING_BOOL("content_show_netplay", &settings->bools.menu_content_show_netplay, true, content_show_netplay, false); +#endif + SETTING_BOOL("content_show_history", &settings->bools.menu_content_show_history, true, content_show_history, false); +#ifdef HAVE_LIBRETRODB + SETTING_BOOL("content_show_add", &settings->bools.menu_content_show_add, true, content_show_add, false); #endif - SETTING_BOOL("xmb_show_music", &settings->bools.menu_xmb_show_music, true, xmb_show_music, false); SETTING_BOOL("menu_show_load_core", &settings->bools.menu_show_load_core, true, menu_show_load_core, false); SETTING_BOOL("menu_show_load_content", &settings->bools.menu_show_load_content, true, menu_show_load_content, false); SETTING_BOOL("menu_show_information", &settings->bools.menu_show_information, true, menu_show_information, false); @@ -1267,23 +1272,18 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("menu_show_reboot", &settings->bools.menu_show_reboot, true, menu_show_reboot, false); SETTING_BOOL("menu_show_online_updater", &settings->bools.menu_show_online_updater, true, menu_show_online_updater, false); SETTING_BOOL("menu_show_core_updater", &settings->bools.menu_show_core_updater, true, menu_show_core_updater, false); -#ifdef HAVE_FFMPEG - SETTING_BOOL("xmb_show_video", &settings->bools.menu_xmb_show_video, true, xmb_show_video, false); -#endif -#ifdef HAVE_NETWORKING - SETTING_BOOL("xmb_show_netplay", &settings->bools.menu_xmb_show_netplay, true, xmb_show_netplay, false); -#endif - SETTING_BOOL("xmb_show_history", &settings->bools.menu_xmb_show_history, true, xmb_show_history, false); -#ifdef HAVE_LIBRETRODB - SETTING_BOOL("xmb_show_add", &settings->bools.menu_xmb_show_add, true, xmb_show_add, false); -#endif -#endif SETTING_BOOL("filter_by_current_core", &settings->bools.filter_by_current_core, false, false /* TODO */, false); SETTING_BOOL("rgui_show_start_screen", &settings->bools.menu_show_start_screen, false, false /* TODO */, false); SETTING_BOOL("menu_navigation_wraparound_enable", &settings->bools.menu_navigation_wraparound_enable, true, true, false); SETTING_BOOL("menu_navigation_browser_filter_supported_extensions_enable", &settings->bools.menu_navigation_browser_filter_supported_extensions_enable, true, true, false); SETTING_BOOL("menu_show_advanced_settings", &settings->bools.menu_show_advanced_settings, true, show_advanced_settings, false); +#ifdef HAVE_MATERIALUI + SETTING_BOOL("materialui_icons_enable", &settings->bools.menu_materialui_icons_enable, true, materialui_icons_enable, false); +#endif +#ifdef HAVE_XMB + SETTING_BOOL("xmb_shadows_enable", &settings->bools.menu_xmb_shadows_enable, true, xmb_shadows_enable, false); +#endif #endif #ifdef HAVE_CHEEVOS SETTING_BOOL("cheevos_enable", &settings->bools.cheevos_enable, true, cheevos_enable, false); diff --git a/configuration.h b/configuration.h index 7fb9d7d83c..c7697167cd 100644 --- a/configuration.h +++ b/configuration.h @@ -146,14 +146,14 @@ typedef struct settings bool menu_show_reboot; bool menu_materialui_icons_enable; bool menu_xmb_shadows_enable; - bool menu_xmb_show_settings; - bool menu_xmb_show_favorites; - bool menu_xmb_show_images; - bool menu_xmb_show_music; - bool menu_xmb_show_video; - bool menu_xmb_show_netplay; - bool menu_xmb_show_history; - bool menu_xmb_show_add; + bool menu_content_show_settings; + bool menu_content_show_favorites; + bool menu_content_show_images; + bool menu_content_show_music; + bool menu_content_show_video; + bool menu_content_show_netplay; + bool menu_content_show_history; + bool menu_content_show_add; bool menu_unified_controls; bool quick_menu_show_take_screenshot; bool quick_menu_show_save_load_state; @@ -420,7 +420,7 @@ typedef struct settings char browse_url[4096]; char path_menu_xmb_font[PATH_MAX_LENGTH]; - char menu_xmb_show_settings_password[PATH_MAX_LENGTH]; + char menu_content_show_settings_password[PATH_MAX_LENGTH]; char kiosk_mode_password[PATH_MAX_LENGTH]; char path_cheat_database[PATH_MAX_LENGTH]; char path_content_database[PATH_MAX_LENGTH]; diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c index feca493716..ec1030047b 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -388,7 +388,7 @@ static int frontend_ctr_get_rating(void) case 1: case 3: /*Old 3/2DS*/ - break; + return 3; case 2: case 4: @@ -401,7 +401,7 @@ static int frontend_ctr_get_rating(void) break; } - return 3; + return -1; } enum frontend_architecture frontend_ctr_get_architecture(void) diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index f2ff7f4a1f..15611c9c26 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -1754,17 +1754,17 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "菜单缩放因子") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "启用图标阴影") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "显示历史页") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "显示导入内容页") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "显示图像页") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "显示音乐页") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "显示设置页") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "显示视频页") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "菜单图标主题") @@ -2903,19 +2903,19 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Select an animated background effect. Can be GPU-intensive depending on the effect. If performance is unsatisfactory, either turn this off or revert to a simpler effect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Select a different main font to be used by the menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Show the image tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Show the music tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Show the video tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Show the netplay tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Show the settings tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Show the recent history tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Show the import content tab inside the main menu.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Show startup screen in menu. This is automatically set to false after the program starts for the first time.") @@ -3099,7 +3099,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Enable/disable the menu icons shown at the lefthand side of the menu entries.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enable Settings Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Set Password For Enabling Settings Tab") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Enter Password") @@ -3109,7 +3109,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Password incorrect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enables the Settings tab. A restart is required for the tab to appear.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Allow the user to rename entries in collections.") diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h index 9c02308171..9b3fe87236 100644 --- a/intl/msg_hash_cht.h +++ b/intl/msg_hash_cht.h @@ -1748,17 +1748,17 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "選單縮放因子") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "啟用圖標陰影") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "顯示歷史頁") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "顯示導入內容頁") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "顯示圖像頁") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "顯示音樂頁") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "顯示設定頁") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "顯示視訊頁") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "選單圖標主題") @@ -2897,19 +2897,19 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Select an animated background effect. Can be GPU-intensive depending on the effect. If performance is unsatisfactory, either turn this off or revert to a simpler effect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Select a different main font to be used by the menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Show the image tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Show the music tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Show the video tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Show the netplay tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Show the settings tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Show the recent history tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Show the import content tab inside the main menu.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Show startup screen in menu. This is automatically set to false after the program starts for the first time.") @@ -3093,7 +3093,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Enable/disable the menu icons shown at the lefthand side of the menu entries.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enable Settings Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Set Password For Enabling Settings Tab") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Enter Password") @@ -3103,7 +3103,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Password incorrect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enables the Settings tab. A restart is required for the tab to appear.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Allow the user to rename entries in collections.") diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 632d439047..fcef9ae95a 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -1805,21 +1805,21 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "Menü-Skalierungsfaktor") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "Icon-Schatten aktivieren") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "Zeige Tab 'Verlauf'") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "Zeige Tab 'Inhalte importieren'") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_FAVORITES, "Zeige Tab 'Favoriten'") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "Zeige Tab 'Bilder'") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "Zeige Tab 'Musik'") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "Zeige Tab 'Einstellungen'") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "Zeige Tab 'Video'") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_NETPLAY, "Zeige Tab 'Netplay'") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "Menü-Design") @@ -2987,21 +2987,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Wähle einen animierten Effekt für das Hintergrundbild. Kann je nach Effekt GPU-lastig sein. Wenn die Leistung nicht ausreicht, wähle einen einfacheren Effekt oder deaktiviere diese Option.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Wähle eine andere Schriftart, die im Menü verwendet werden soll.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_FAVORITES, "Zeige den Reiter 'Favoriten' im Hauptmenü an.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Zeige den Reiter 'Bilder' im Hauptmenü an.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Zeige den Reiter 'Musik' im Hauptmenü an.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Zeige den Reiter 'Video' im Hauptmenü an.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Zeigen den Reiter 'Netplay' im Hauptmenü an.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Zeige den Reiter 'Einstellungen' im Hauptmenü an") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Zeige den Reiter 'Verlauf' im Hauptmenü an.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Zeige den Reiter 'Inhalt importieren' im Hauptmenü an") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Zeige einen Startbildschirm im Menü an. Wird automatisch deaktiviert, nachdem das Programm zum ersten Mal gestartet wurde.") @@ -3187,7 +3187,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Aktiviere/deaktiviere die Menü-Icons, die auf der linken Seite der Menü-Einträge angezeigt werden.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Aktiviere den Reiter 'Einstellungen'") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Passwort zum Aktivieren des Reiters 'Einstellungen' festlegen") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Passwort eingeben") @@ -3197,7 +3197,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Passwort falsch.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Aktiviert den Reiter 'Einstellungen'. Ein Neustart wird benötigt, damit der Reiter angezeigt wird.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Wird vor dem Verstecken der Einstellungen ein Passwort vergeben, wird es später möglich sein, den Reiter wiederherzustellen, in dem die Funktion 'Aktiviere den Reiter 'Einstellungen' ausgewählt und das Passwort dort eingegeben wird.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Erlaube dem Benutzer, Einträge in der Sammlung umzubenennen.") diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 07aec48964..7c53ff8d87 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -1650,15 +1650,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "Menu Scale Factor") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "Icon Shadows Enable") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "Display History Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "Display Image Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "Display Music Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "Display Settings Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "Display Video Tab") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "Menu Icon Theme") @@ -2764,21 +2764,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Select an animated background effect. Can be GPU-intensive depending on the effect. If performance is unsatisfactory, either turn this off or revert to a simpler effect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Select a different main font to be used by the menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_FAVORITES, "Show the favourites tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Show the image tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Show the music tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Show the video tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Show the netplay tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Show the settings tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Show the recent history tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Show the import content tab inside the main menu.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Show startup screen in menu. This is automatically set to false after the program starts for the first time.") @@ -2962,7 +2962,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Enable/disable the menu icons shown at the lefthand side of the menu entries.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enable Settings Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Set Password For Enabling Settings Tab") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Enter Password") @@ -2972,7 +2972,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Password incorrect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enables the Settings tab. A restart is required for the tab to appear.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Allow the user to rename entries in collections.") diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 8cfb7aebea..2adb722d69 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -1775,15 +1775,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "Taille du texte du menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "Ombres pour les icônes") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "Afficher l'onglet Historique") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "Afficher l'onglet Images") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "Afficher l'onglet Musique") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "Afficher l'onglet Paramètres") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "Afficher l'onglet Vidéo") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "Thème XMB") @@ -2935,19 +2935,19 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Select an animated background effect. Can be GPU-intensive depending on the effect. If performance is unsatisfactory, either turn this off or revert to a simpler effect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Select a different main font to be used by the menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Affiche l'onglet des images dans le menu principal.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Affiche l'onglet des musiques dans le menu principal.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Affiche l'onglet des vidéos dans le menu principal.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Affiche l'onglet de jeu en réseau dans le menu principal.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Affiche l'onglet ces réglages dans le menu principal.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Affiche l'onglet de l'historique dans le menu principal.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Show the import content tab inside the main menu.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Show startup screen in menu. This is automatically set to false after the program starts for the first time.") @@ -3131,7 +3131,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Enable/disable the menu icons shown at the lefthand side of the menu entries.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enable Settings Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Set Password For Enabling Settings Tab") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Enter Password") @@ -3141,7 +3141,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Password incorrect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enables the Settings tab. A restart is required for the tab to appear.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Allow the user to rename entries in collections.") diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 0d259f61a8..544312f035 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -1803,21 +1803,21 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "Menu Scale Factor") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "Abilita Ombre delle Icone") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "Visualizza la colonna cronologia") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "Visualizza colonna Importa contenuto") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_FAVORITES, "Visualizza colonna Preferiti") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "Visualizza colonna Immagini") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "Visualizza colonna Musica") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "Visualizza colonna Impostazioni") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "Visualizza colonna Video") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_NETPLAY, "Visualizza colonna Stanze Netplay ") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "Icone del Menu") @@ -2985,21 +2985,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Seleziona un effetto con sfondo animato. Può essere intenso in base alla GPU a seconda dell'effetto. Se le prestazioni sono insoddisfacenti, disattivare o tornare ad un effetto più semplice.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Seleziona un altro tipo di carattere principale da utilizzare dal menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_FAVORITES, "Mostra la colonna preferiti all'interno del menu principale.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Mostra la colonna immagini all'interno del menu principale.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Mostra la colonna musica all'interno del menu principale.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Mostra la colonna video all'interno del menu principale") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Mostra la colonna camere netplay all'interno del menu principale") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Mostra la colonna impostazioni all'interno del menu principale") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Mostra la colonna cronologia all'interno del menu principale.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Mostra la colonna importa contenuto all'interno del menu principale.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Mostra la schermata di avvio nel menu. Questo viene automaticamente impostato su off dopo l'avvio del programma per la prima volta.") @@ -3189,7 +3189,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Abilita/disabilita le icone del menu visualizzate sul lato sinistro di ogni voce.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Abilita la colonna Impostazioni") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Imposta una Password per abilitare la colonna Impostazioni") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Inserisci Password") @@ -3199,7 +3199,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Password non corretta.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Abilita la colonna Impostazioni. È necessario un riavvio affinchè le modifiche abbiano effetto.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Fornisce una password quando si nasconde la colonna Impostazioni per poi ripristinarli dal menu, andando alla colonna Menù Principale, selezionando abilita la colonna Impostazioni e immettere la password") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Consente all'utente di rinominare le voci nelle collezioni.") diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index e6d19a7cc4..44bba48fb9 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -1829,21 +1829,21 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "メニューの倍率") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "アイコンの影を有効") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "履歴タブを表示") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "コンテンツをインポートするタブを表示") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_FAVORITES, "お気に入りタブを表示") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "画像タブを表示") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "音楽タブを表示") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "設定タブを表示") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "ビデオタブを表示") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_NETPLAY, "ネットプレイタブを表示") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "メニューのアイコンテーマ") @@ -2965,19 +2965,19 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Select an animated background effect. Can be GPU-intensive depending on the effect. If performance is unsatisfactory, either turn this off or revert to a simpler effect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "メニューの使用するフォントを選択する。") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "メニューにイメージタブを表示する。") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "メニューに音楽タブを表示する。") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "メニューにビデオタブを表示する。") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "メニューにネットプレイタブを表示する。") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "メニューに設定タブを表示する。") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "メニューに履歴タブを表示する。") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "メニューにコンテンツをインポートするタブを表示する。") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "メニューにスタートスクリーンを表示する。") @@ -3127,7 +3127,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Enable/disable the menu icons shown at the lefthand side of the menu entries.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "設定タブを有効") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "設定タブを有効するパスワード") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "パスワードを入力してください") @@ -3137,7 +3137,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "パスワードが違います") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enables the Settings tab. A restart is required for the tab to appear.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Allow the user to rename entries in collections.") diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index 298b02ffec..669e5042a3 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -1751,19 +1751,19 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "메뉴 크기 요소") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "아이콘 그림자 사용") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "최근 목록 탭 표시") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "가져온 컨텐츠 탭 표시") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "이미지 탭 표시") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "음악 탭 표시") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "설정 탭 보이기") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "비디오 탭 보이기") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_NETPLAY, "넷플레이 탭 보이기") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "메뉴 아이콘 테마") @@ -2899,19 +2899,19 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "애니메이션 배경 효과 선택. 선택한 효과에 따라 GPU 부하를 줄 수 있습니다. 성능에 영향을 주는 경우 기능을 끄거나 간단한 효과로 되돌리십시오.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "메뉴에 사용할 기본 폰트 선택.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "메인 메뉴에 이미지 탭 보이기.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "메인 메뉴에 음악 탭 보이기.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "메인 메뉴에 비디오 탭 보이기.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "메인 메뉴에 넷플레이 탭 보이기.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "메인 메뉴에 설정 탭 보이기.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "메인 메뉴에 최근 실행목록 탭 보이기.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "메인 메뉴에 컨텐츠 가져오기 탭 보이기.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "시작 화면을 메뉴에 보이기. 프로그램 첫 실행 후 자동으로 비활성 됩니다.") @@ -3094,7 +3094,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Enable/disable the menu icons shown at the lefthand side of the menu entries.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enable Settings Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Set Password For Enabling Settings Tab") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Enter Password") @@ -3104,7 +3104,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Password incorrect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enables the Settings tab. A restart is required for the tab to appear.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Allow the user to rename entries in collections.") diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 30011a238b..27124e3489 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -1179,24 +1179,24 @@ MSG_HASH(MENU_ENUM_LABEL_XMB_SCALE_FACTOR, "xmb_scale_factor") MSG_HASH(MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE, "xmb_shadows_enable") -MSG_HASH(MENU_ENUM_LABEL_XMB_SHOW_HISTORY, - "xmb_show_history") -MSG_HASH(MENU_ENUM_LABEL_XMB_SHOW_ADD, - "xmb_show_add") -MSG_HASH(MENU_ENUM_LABEL_XMB_SHOW_FAVORITES, - "xmb_show_favorites") -MSG_HASH(MENU_ENUM_LABEL_XMB_SHOW_IMAGES, - "xmb_show_images") -MSG_HASH(MENU_ENUM_LABEL_XMB_SHOW_MUSIC, - "xmb_show_music") -MSG_HASH(MENU_ENUM_LABEL_XMB_SHOW_SETTINGS, - "xmb_show_settings") -MSG_HASH(MENU_ENUM_LABEL_XMB_SHOW_SETTINGS_PASSWORD, - "xmb_show_settings_password") -MSG_HASH(MENU_ENUM_LABEL_XMB_SHOW_VIDEO, - "xmb_show_video") -MSG_HASH(MENU_ENUM_LABEL_XMB_SHOW_NETPLAY, - "xmb_show_netplay") +MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_HISTORY, + "content_show_history") +MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_ADD, + "content_show_add") +MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_FAVORITES, + "content_show_favorites") +MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_IMAGES, + "content_show_images") +MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_MUSIC, + "content_show_music") +MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS, + "content_show_settings") +MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_PASSWORD, + "content_show_settings_password") +MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_VIDEO, + "content_show_video") +MSG_HASH(MENU_ENUM_LABEL_CONTENT_SHOW_NETPLAY, + "content_show_netplay") MSG_HASH(MENU_ENUM_LABEL_XMB_THEME, "xmb_theme") MSG_HASH(MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index a80eb0ddb9..9a825cd3f1 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -1648,15 +1648,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "Menu Scale Factor") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "Icon Shadows Enable") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "Geschiedenistab weergeven") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "Afbeeldingentab weergeven") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "Muziektab weergeven") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "Instellingentab weergeven") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "Videotab weergeven") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "Menu Icon Theme") @@ -2768,19 +2768,19 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Select an animated background effect. Can be GPU-intensive depending on the effect. If performance is unsatisfactory, either turn this off or revert to a simpler effect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Select a different main font to be used by the menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Show the image tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Show the music tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Show the video tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Show the netplay tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Show the settings tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Show the recent history tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Show the import content tab inside the main menu.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Show startup screen in menu. This is automatically set to false after the program starts for the first time.") @@ -2964,7 +2964,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Enable/disable the menu icons shown at the lefthand side of the menu entries.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enable Settings Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Set Password For Enabling Settings Tab") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Enter Password") @@ -2974,7 +2974,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Password incorrect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enables the Settings tab. A restart is required for the tab to appear.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Allow the user to rename entries in collections.") diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h index 9c2ea6e5fa..7342c499c3 100644 --- a/intl/msg_hash_pl.h +++ b/intl/msg_hash_pl.h @@ -1811,21 +1811,21 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "Współczynnik skali menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "Włącz cienie ikony") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "Pokaż kartę historii") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "Pokaż kartę Importuj zawartość") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_FAVORITES, "Pokaż kartę Ulubione") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "Pokaż kartę Obraz") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "Pokaż kartę Muzyka") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "Pokaż kartę Ustawienia") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "Pokaż kartę Wideo") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_NETPLAY, "Pokaż kartę Netplay") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "Motyw ikon menu") @@ -2999,21 +2999,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Wybierz animowany efekt tła. Może być intensywnie wykorzystujący GPU w zależności od efektu. Jeśli wydajność jest niezadowalająca, wyłącz to lub powróć do prostszego efektu.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Wybierz inną główną czcionkę, która ma być używana w menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_FAVORITES, "Pokaż zakładkę Ulubione w menu głównym.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Pokaż kartę Obrazu w menu głównym.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Pokaż zakładkę Muzyka w menu głównym.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Pokaż kartę Video w menu głównym.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Pokaż zakładkę Netplay w menu głównym.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Pokaż kartę Ustawień w menu głównym.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Pokaż kartę ostatnich historii w menu głównym.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Pokaż kartę treści importu w menu głównym.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Pokaż ekran startowy w menu. Po pierwszym uruchomieniu program jest automatycznie ustawiany na false.") @@ -3199,7 +3199,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Włącz / wyłącz ikony menu pokazane po lewej stronie wpisów menu.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Włącz kartę Ustawienia") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Ustaw hasło dla włączania karty Ustawienia") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Wprowadź hasło") @@ -3209,7 +3209,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Hasło niepoprawne.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Włącza kartę Ustawienia. Wymagane jest ponowne uruchomienie karty.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Podanie hasła podczas ukrywania karty ustawień pozwala później przywrócić ją z menu, przechodząc do karty Menu główne, wybierając opcję Włącz kartę Ustawienia i wprowadzając hasło.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Zezwalaj użytkownikowi na zmianę nazw wpisów w kolekcjach.") diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index 63118391e3..1356946958 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -2306,28 +2306,28 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "Habilitar Sombras dos Ícones" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "Exibir Aba de Histórico" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "Exibir Aba de Importação de Conteúdo" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_FAVORITES, "Exibir Aba de Favoritos" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "Exibir Aba de Imagem" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "Exibir Aba de Música" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "Exibir Aba de Configurações" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "Exibir Aba de Vídeo" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_NETPLAY, "Exibir Aba de Netplay" ) MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, @@ -3758,28 +3758,28 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Selecionar uma fonte principal diferente para ser usada pelo menu." ) -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_FAVORITES, "Exibir a aba de favoritos dentro do menu principal." ) -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Exibir a aba de imagem dentro do menu principal." ) -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Exibir a aba de música dentro do menu principal." ) -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Exibir a aba de vídeo dentro do menu principal." ) -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Exibir a aba de Netplay dentro do menu principal." ) -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Mostrar a aba de configurações dentro do menu principal." ) -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Mostrar a aba de histórico recente dentro do menu principal." ) -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Mostrar a aba de importação de conteúdo dentro do menu principal." ) MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, @@ -4019,7 +4019,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enable Settings Tab" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Set Password For Enabling Settings Tab" ) MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, @@ -4034,7 +4034,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enables the Settings tab. A restart is required for the tab to appear." ) -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password." ) MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index bb5d7b6875..a1b320918c 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -1743,17 +1743,17 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "Fator de Escala do Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "Habilitar Sombras nas Ícones") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "Exibir Aba de Histórico") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "Exibir Aba de Importação de Conteúdo") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "Exibir Aba de Imagem") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "Exibir Aba de Música") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "Exibir Aba de Definições") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "Exibir Aba de Vídeo") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "Ícone do Tema do Menu") @@ -2877,17 +2877,17 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Selecionar um efeito de fundo animado. Pode ser que a intensidade de processamento de vídeo seja mais intensa dependendo do efeito. Se a performance for insatisfatória, ou desligue este efeito ou reverta para umn efeito mais simples.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Selecionar uma fonte principal diferente para ser usada pelo menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Mostrar a aba de imagem dentro do menu princial.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Mostrar a aba de música dentro do menu princial.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Mostrar a aba de vídeo dentro do menu principal.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Mostrar a aba de definições dentro do menu principal.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Mostrar a aba de histórico recente dentro do menu principal.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Mostrar a aba de importação de coneúdo dentro do menu principal.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Mostrar a tela inicial no menu. Isso é automaticamento definido como falso após o programa iniciar na primeira vez.") @@ -3069,7 +3069,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Enable/disable the menu icons shown at the lefthand side of the menu entries.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enable Settings Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Set Password For Enabling Settings Tab") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Enter Password") @@ -3079,7 +3079,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Password incorrect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enables the Settings tab. A restart is required for the tab to appear.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Allow the user to rename entries in collections.") diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 2510b094bd..5729476995 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -1784,19 +1784,19 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "Масштаб в меню") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "Отображение теней у иконок") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "Показать вкладку История просмотров") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "Показать вкладку Импорт контента") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "Показать вкладку Изображение") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "Показать вкладку Музыка") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "Показать вкладку Настройки") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "Показать вкладку Видео") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_NETPLAY, "Показать вкладку Сетевая игра") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "Тема значка меню") @@ -2950,19 +2950,19 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Выберите анимированный фоновый эффект. Может быть требовательным к GPU в зависимости от эффекта. Если производительность не тянет на это, то либо выключите это, либо вернитесь к более простому эффекту.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Выбрать основной шрифт для меню интерфейса.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Показать вкладку Изображения в главном меню.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Показать вкладку Музыка в главном меню.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Показать вкладку Видео в главном меню.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Показать вкладку Сетевая игра в главном меню.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Показать вкладку Настройка в главном меню.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Показать вкладку История просмотров в главном меню.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Показать вкладку Импорт контента в главном меню.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Показать начальный экран. Этот параметре автомотически выключается после первого включения.") @@ -3152,7 +3152,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Отображать или скрывать иконки интерфейса, отображающиеся в левой части меню.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Включить вкладку Настройки") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Задать пароль для включения вкладки Настройки") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Введите пароль") @@ -3162,7 +3162,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Пароль неверен.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Включает вкладку Настройки. Для появления вкладки требуется перезапуск.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Применение пароля при скрытии вкладки Настройки может позже восстановить ее из меню. Для этого нужно перейти на вкладку Главное меню, выбрать Включить вкладку Настройки и ввести пароль.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Разрешить пользователю переименовывать записи в коллекции.") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 2daa63d6d1..fe4d25dcf7 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1819,21 +1819,21 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "Menu Scale Factor") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "Icon Shadows Enable") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "Show History Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "Show Import content Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_FAVORITES, "Show Favorites Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "Show Image Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "Show Music Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "Show Settings Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "Show Video Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_NETPLAY, "Show Netplay Tab") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "Menu Icon Theme") @@ -3007,21 +3007,21 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Select an animated background effect. Can be GPU-intensive depending on the effect. If performance is unsatisfactory, either turn this off or revert to a simpler effect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Select a different main font to be used by the menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_FAVORITES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_FAVORITES, "Show the favorites tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Show the image tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Show the music tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Show the video tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Show the netplay tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Show the settings tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Show the recent history tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Show the import content tab inside the main menu.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Show startup screen in menu. This is automatically set to false after the program starts for the first time.") @@ -3207,7 +3207,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Enable/disable the menu icons shown at the lefthand side of the menu entries.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enable Settings Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Set Password For Enabling Settings Tab") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Enter Password") @@ -3217,7 +3217,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Password incorrect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enables the Settings tab. A restart is required for the tab to appear.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Allow the user to rename entries in collections.") diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index 229c1227ea..b2c1cc254a 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -1763,19 +1763,19 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, "Menu Scale Factor") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, "Kích hoạt Icon Shadows") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, "Display History Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, "Display Import content Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, "Display Image Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, "Display Music Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, "Show thiết lập Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, "Display Video Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_NETPLAY, "Display Netplay Tab") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME, "Menu Icon Theme") @@ -2927,19 +2927,19 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Select an animated background effect. Can be GPU-intensive depending on the effect. If performance is unsatisfactory, either turn this off or revert to a simpler effect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Select a different main font to be used by the menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "Show the image tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, "Show the music tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO, "Show the video tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY, "Show the netplay tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS, "Show the settings tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY, "Show the recent history tab inside the main menu.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD, "Show the import content tab inside the main menu.") MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN, "Show startup screen in menu. This is automatically set to false after the program starts for the first time.") @@ -3117,7 +3117,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE, "Enable/disable the menu icons shown at the lefthand side of the menu entries.") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enable Settings Tab") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, "Set Password For Enabling Settings Tab") MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD, "Enter Password") @@ -3127,7 +3127,7 @@ MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK, "Password incorrect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, "Enables the Settings tab. A restart is required for the tab to appear.") -MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD, +MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD, "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME, "Allow the user to rename entries in collections.") diff --git a/libretro-common/features/features_cpu.c b/libretro-common/features/features_cpu.c index e4b40dacbd..24d97a7905 100644 --- a/libretro-common/features/features_cpu.c +++ b/libretro-common/features/features_cpu.c @@ -500,8 +500,9 @@ unsigned cpu_features_get_core_amount(void) default: /*Unknown Device Or Check Failed*/ - return 1; + break; } + return 1; #elif defined(WIIU) return 3; #elif defined(_SC_NPROCESSORS_ONLN) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 1d5d6ba742..a563ce1042 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1912,9 +1912,9 @@ static void menu_input_st_string_cb_enable_settings(void *userdata, const char *label = menu_input_dialog_get_buffer(); settings_t *settings = config_get_ptr(); - if (string_is_equal(label, settings->paths.menu_xmb_show_settings_password)) + if (string_is_equal(label, settings->paths.menu_content_show_settings_password)) { - settings->bools.menu_xmb_show_settings = true; + settings->bools.menu_content_show_settings = true; runloop_msg_queue_push( msg_hash_to_str(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_OK), diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 35df01408f..734da03336 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -241,10 +241,10 @@ default_sublabel_macro(action_bind_sublabel_delete_entry, default_sublabel_macro(action_bind_sublabel_information, MENU_ENUM_SUBLABEL_INFORMATION) default_sublabel_macro(action_bind_sublabel_run, MENU_ENUM_SUBLABEL_RUN) default_sublabel_macro(action_bind_sublabel_add_to_favorites, MENU_ENUM_SUBLABEL_ADD_TO_FAVORITES) -default_sublabel_macro(action_bind_sublabel_goto_favorites, MENU_ENUM_SUBLABEL_GOTO_FAVORITES) -default_sublabel_macro(action_bind_sublabel_goto_images, MENU_ENUM_SUBLABEL_GOTO_IMAGES) -default_sublabel_macro(action_bind_sublabel_goto_music, MENU_ENUM_SUBLABEL_GOTO_MUSIC) -default_sublabel_macro(action_bind_sublabel_goto_video, MENU_ENUM_SUBLABEL_GOTO_VIDEO) +default_sublabel_macro(action_bind_sublabel_goto_favorites, MENU_ENUM_SUBLABEL_GOTO_FAVORITES) +default_sublabel_macro(action_bind_sublabel_goto_images, MENU_ENUM_SUBLABEL_GOTO_IMAGES) +default_sublabel_macro(action_bind_sublabel_goto_music, MENU_ENUM_SUBLABEL_GOTO_MUSIC) +default_sublabel_macro(action_bind_sublabel_goto_video, MENU_ENUM_SUBLABEL_GOTO_VIDEO) default_sublabel_macro(action_bind_sublabel_menu_filebrowser_settings, MENU_ENUM_SUBLABEL_MENU_FILE_BROWSER_SETTINGS) default_sublabel_macro(action_bind_sublabel_auto_remaps_enable, MENU_ENUM_SUBLABEL_AUTO_REMAPS_ENABLE) default_sublabel_macro(action_bind_sublabel_auto_overrides_enable, MENU_ENUM_SUBLABEL_AUTO_OVERRIDES_ENABLE) @@ -308,8 +308,8 @@ default_sublabel_macro(action_bind_sublabel_quick_menu_show_information, default_sublabel_macro(action_bind_sublabel_menu_enable_kiosk_mode, MENU_ENUM_SUBLABEL_MENU_ENABLE_KIOSK_MODE) default_sublabel_macro(action_bind_sublabel_menu_disable_kiosk_mode, MENU_ENUM_SUBLABEL_MENU_DISABLE_KIOSK_MODE) default_sublabel_macro(action_bind_sublabel_menu_kiosk_mode_password, MENU_ENUM_SUBLABEL_MENU_KIOSK_MODE_PASSWORD) -default_sublabel_macro(action_bind_sublabel_menu_favorites_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_FAVORITES) -default_sublabel_macro(action_bind_sublabel_menu_images_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES) +default_sublabel_macro(action_bind_sublabel_menu_favorites_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_FAVORITES) +default_sublabel_macro(action_bind_sublabel_menu_images_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES) default_sublabel_macro(action_bind_sublabel_menu_show_load_core, MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CORE) default_sublabel_macro(action_bind_sublabel_menu_show_load_content, MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT) default_sublabel_macro(action_bind_sublabel_menu_show_information, MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION) @@ -319,13 +319,13 @@ default_sublabel_macro(action_bind_sublabel_menu_show_quit_retroarch, default_sublabel_macro(action_bind_sublabel_menu_show_reboot, MENU_ENUM_SUBLABEL_MENU_SHOW_REBOOT) default_sublabel_macro(action_bind_sublabel_menu_show_online_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_ONLINE_UPDATER) default_sublabel_macro(action_bind_sublabel_menu_show_core_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_CORE_UPDATER) -default_sublabel_macro(action_bind_sublabel_menu_music_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC) -default_sublabel_macro(action_bind_sublabel_menu_video_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO) -default_sublabel_macro(action_bind_sublabel_menu_netplay_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY) -default_sublabel_macro(action_bind_sublabel_menu_settings_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS) -default_sublabel_macro(action_bind_sublabel_menu_settings_tab_enable_password, MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS_PASSWORD) -default_sublabel_macro(action_bind_sublabel_menu_history_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY) -default_sublabel_macro(action_bind_sublabel_menu_import_content_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_ADD) +default_sublabel_macro(action_bind_sublabel_menu_music_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC) +default_sublabel_macro(action_bind_sublabel_menu_video_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO) +default_sublabel_macro(action_bind_sublabel_menu_netplay_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY) +default_sublabel_macro(action_bind_sublabel_menu_settings_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS) +default_sublabel_macro(action_bind_sublabel_menu_settings_tab_enable_password, MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD) +default_sublabel_macro(action_bind_sublabel_menu_history_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY) +default_sublabel_macro(action_bind_sublabel_menu_import_content_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD) default_sublabel_macro(action_bind_sublabel_main_menu_enable_settings, MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS) default_sublabel_macro(action_bind_sublabel_rgui_show_start_screen, MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN) default_sublabel_macro(action_bind_sublabel_menu_header_opacity, MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY) @@ -597,19 +597,19 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_RGUI_SHOW_START_SCREEN: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_rgui_show_start_screen); break; - case MENU_ENUM_LABEL_XMB_SHOW_ADD: + case MENU_ENUM_LABEL_CONTENT_SHOW_ADD: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_import_content_tab); break; case MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_main_menu_enable_settings); break; - case MENU_ENUM_LABEL_XMB_SHOW_HISTORY: + case MENU_ENUM_LABEL_CONTENT_SHOW_HISTORY: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_history_tab); break; - case MENU_ENUM_LABEL_XMB_SHOW_SETTINGS: + case MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_settings_tab); break; - case MENU_ENUM_LABEL_XMB_SHOW_SETTINGS_PASSWORD: + case MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_PASSWORD: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_settings_tab_enable_password); break; case MENU_ENUM_LABEL_GOTO_IMAGES: @@ -666,13 +666,13 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_MENU_KIOSK_MODE_PASSWORD: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_kiosk_mode_password); break; - case MENU_ENUM_LABEL_XMB_SHOW_FAVORITES: + case MENU_ENUM_LABEL_CONTENT_SHOW_FAVORITES: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_favorites_tab); break; - case MENU_ENUM_LABEL_XMB_SHOW_IMAGES: + case MENU_ENUM_LABEL_CONTENT_SHOW_IMAGES: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_images_tab); break; - case MENU_ENUM_LABEL_XMB_SHOW_MUSIC: + case MENU_ENUM_LABEL_CONTENT_SHOW_MUSIC: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_music_tab); break; case MENU_ENUM_LABEL_MENU_SHOW_LOAD_CORE: @@ -702,10 +702,10 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_MENU_SHOW_CORE_UPDATER: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_core_updater); break; - case MENU_ENUM_LABEL_XMB_SHOW_NETPLAY: + case MENU_ENUM_LABEL_CONTENT_SHOW_NETPLAY: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_netplay_tab); break; - case MENU_ENUM_LABEL_XMB_SHOW_VIDEO: + case MENU_ENUM_LABEL_CONTENT_SHOW_VIDEO: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_video_tab); break; case MENU_ENUM_LABEL_XMB_FONT: diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 5dccbf882c..d320fb730c 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -36,9 +36,8 @@ #include "../../config.h" #endif -#ifndef HAVE_DYNAMIC +//this is required regardless of HAVE_DYNAMIC for frontend_driver_parse_drive_list #include "../../frontend/frontend_driver.h" -#endif #include "menu_generic.h" @@ -2029,6 +2028,8 @@ static int mui_list_push(void *data, void *userdata, { case DISPLAYLIST_LOAD_CONTENT_LIST: { + settings_t *settings = config_get_ptr(); + menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_append_enum(info->list, @@ -2066,6 +2067,7 @@ static int mui_list_push(void *data, void *userdata, break; case DISPLAYLIST_MAIN_MENU: { + settings_t *settings = config_get_ptr(); rarch_system_info_t *system = runloop_get_system_info(); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); @@ -2086,8 +2088,11 @@ static int mui_list_push(void *data, void *userdata, if (frontend_driver_has_fork()) #endif { - entry.enum_idx = MENU_ENUM_LABEL_CORE_LIST; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + if (settings->bools.menu_show_load_core) + { + entry.enum_idx = MENU_ENUM_LABEL_CORE_LIST; + menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + } } if (system->load_no_content) @@ -2096,12 +2101,17 @@ static int mui_list_push(void *data, void *userdata, menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); } + if (settings->bools.menu_show_load_content) + { + entry.enum_idx = MENU_ENUM_LABEL_LOAD_CONTENT_LIST; + menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + } - entry.enum_idx = MENU_ENUM_LABEL_LOAD_CONTENT_LIST; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); - - entry.enum_idx = MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + if (settings->bools.menu_content_show_history) + { + entry.enum_idx = MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY; + menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + } #if defined(HAVE_NETWORKING) #ifdef HAVE_LAKKA @@ -2118,27 +2128,42 @@ static int mui_list_push(void *data, void *userdata, } #endif - entry.enum_idx = MENU_ENUM_LABEL_NETPLAY; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + if (settings->bools.menu_content_show_netplay) + { + entry.enum_idx = MENU_ENUM_LABEL_NETPLAY; + menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + } #endif - entry.enum_idx = MENU_ENUM_LABEL_INFORMATION_LIST; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + if (settings->bools.menu_show_information) + { + entry.enum_idx = MENU_ENUM_LABEL_INFORMATION_LIST; + menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + } #ifndef HAVE_DYNAMIC entry.enum_idx = MENU_ENUM_LABEL_RESTART_RETROARCH; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); #endif - entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_LIST; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + if (settings->bools.menu_show_configurations) + { + entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_LIST; + menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + } - entry.enum_idx = MENU_ENUM_LABEL_HELP_LIST; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + if (settings->bools.menu_show_help) + { + entry.enum_idx = MENU_ENUM_LABEL_HELP_LIST; + menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + } #if !defined(IOS) entry.enum_idx = MENU_ENUM_LABEL_QUIT_RETROARCH; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); #endif #if defined(HAVE_LAKKA) - entry.enum_idx = MENU_ENUM_LABEL_REBOOT; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + if (settings->bools.menu_show_reboot) + { + entry.enum_idx = MENU_ENUM_LABEL_REBOOT; + menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + } entry.enum_idx = MENU_ENUM_LABEL_SHUTDOWN; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 7af105883c..4da0317170 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -36,6 +36,9 @@ #include "../../config.h" #endif +//this is required regardless of HAVE_DYNAMIC for frontend_driver_parse_drive_list +#include "../../frontend/frontend_driver.h" + #include "menu_generic.h" #include "../menu_driver.h" @@ -523,7 +526,7 @@ static void rgui_render(void *data, bool is_idle) back_buf[0] = back_msg[0] = '\0'; strlcpy(back_buf, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK), sizeof(back_buf)); - strlcpy(back_msg, string_to_upper(back_buf), sizeof(back_msg)); + string_to_upper(back_buf); if (rgui_framebuf_data) blit_line( RGUI_TERM_START_X(fb_width), @@ -532,7 +535,7 @@ static void rgui_render(void *data, bool is_idle) TITLE_COLOR(settings)); } - strlcpy(title_buf, string_to_upper(title_buf), sizeof(title_buf)); + string_to_upper(title_buf); if (rgui_framebuf_data) blit_line( diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index d715f53e5c..b8b93365a9 100755 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -36,9 +36,8 @@ #include "../../config.h" #endif -#ifndef HAVE_DYNAMIC +//this is required regardless of HAVE_DYNAMIC for frontend_driver_parse_drive_list #include "../../frontend/frontend_driver.h" -#endif #include "menu_generic.h" @@ -3509,28 +3508,28 @@ static void *xmb_init(void **userdata, bool video_is_threaded) xmb->system_tab_end = 0; xmb->tabs[xmb->system_tab_end] = XMB_SYSTEM_TAB_MAIN; - if (settings->bools.menu_xmb_show_settings && !settings->bools.kiosk_mode_enable) + if (settings->bools.menu_content_show_settings && !settings->bools.kiosk_mode_enable) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_SETTINGS; - if (settings->bools.menu_xmb_show_favorites) + if (settings->bools.menu_content_show_favorites) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_FAVORITES; - if (settings->bools.menu_xmb_show_history) + if (settings->bools.menu_content_show_history) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_HISTORY; #ifdef HAVE_IMAGEVIEWER - if (settings->bools.menu_xmb_show_images) + if (settings->bools.menu_content_show_images) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_IMAGES; #endif - if (settings->bools.menu_xmb_show_music) + if (settings->bools.menu_content_show_music) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_MUSIC; #ifdef HAVE_FFMPEG - if (settings->bools.menu_xmb_show_video) + if (settings->bools.menu_content_show_video) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_VIDEO; #endif #ifdef HAVE_NETWORKING - if (settings->bools.menu_xmb_show_netplay) + if (settings->bools.menu_content_show_netplay) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_NETPLAY; #endif #ifdef HAVE_LIBRETRODB - if (settings->bools.menu_xmb_show_add && !settings->bools.kiosk_mode_enable) + if (settings->bools.menu_content_show_add && !settings->bools.kiosk_mode_enable) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_ADD; #endif @@ -4397,7 +4396,7 @@ static int xmb_list_push(void *data, void *userdata, } } #endif - if (!settings->bools.menu_xmb_show_settings && !string_is_empty(settings->paths.menu_xmb_show_settings_password)) + if (!settings->bools.menu_content_show_settings && !string_is_empty(settings->paths.menu_content_show_settings_password)) { entry.enum_idx = MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index d40ca3713b..d690e9331c 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3333,18 +3333,20 @@ static int menu_displaylist_parse_playlists( MENU_ENUM_LABEL_SCAN_FILE, MENU_SETTING_ACTION, 0, 0); #endif + if (settings->bools.menu_content_show_favorites) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES), msg_hash_to_str(MENU_ENUM_LABEL_GOTO_FAVORITES), MENU_ENUM_LABEL_GOTO_FAVORITES, MENU_SETTING_ACTION, 0, 0); - + if (settings->bools.menu_content_show_images) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES), msg_hash_to_str(MENU_ENUM_LABEL_GOTO_IMAGES), MENU_ENUM_LABEL_GOTO_IMAGES, MENU_SETTING_ACTION, 0, 0); + if (settings->bools.menu_content_show_music) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC), msg_hash_to_str(MENU_ENUM_LABEL_GOTO_MUSIC), @@ -3352,6 +3354,7 @@ static int menu_displaylist_parse_playlists( MENU_SETTING_ACTION, 0, 0); #ifdef HAVE_FFMPEG + if (settings->bools.menu_content_show_video) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO), msg_hash_to_str(MENU_ENUM_LABEL_GOTO_VIDEO), @@ -5118,41 +5121,41 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) #endif menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_SHOW_SETTINGS, + MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS, PARSE_ONLY_BOOL, false); menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_SHOW_SETTINGS_PASSWORD, + MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_PASSWORD, PARSE_ONLY_STRING, false); menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_SHOW_FAVORITES, + MENU_ENUM_LABEL_CONTENT_SHOW_FAVORITES, PARSE_ONLY_BOOL, false); #ifdef HAVE_IMAGEVIEWER menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_SHOW_IMAGES, + MENU_ENUM_LABEL_CONTENT_SHOW_IMAGES, PARSE_ONLY_BOOL, false); #endif menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_SHOW_MUSIC, + MENU_ENUM_LABEL_CONTENT_SHOW_MUSIC, PARSE_ONLY_BOOL, false); #ifdef HAVE_FFMPEG menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_SHOW_VIDEO, + MENU_ENUM_LABEL_CONTENT_SHOW_VIDEO, PARSE_ONLY_BOOL, false); #endif #ifdef HAVE_NETWORKING menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_SHOW_NETPLAY, + MENU_ENUM_LABEL_CONTENT_SHOW_NETPLAY, PARSE_ONLY_BOOL, false); #endif menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_SHOW_HISTORY, + MENU_ENUM_LABEL_CONTENT_SHOW_HISTORY, PARSE_ONLY_BOOL, false); #ifdef HAVE_LIBRETRODB menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_SHOW_ADD, + MENU_ENUM_LABEL_CONTENT_SHOW_ADD, PARSE_ONLY_BOOL, false); #endif menu_displaylist_parse_settings_enum(menu, info, @@ -6110,19 +6113,28 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) case DISPLAYLIST_LOAD_CONTENT_LIST: case DISPLAYLIST_LOAD_CONTENT_SPECIAL: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); + + if (!string_is_empty(settings->paths.directory_menu_content)) + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FAVORITES), + msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES), + MENU_ENUM_LABEL_FAVORITES, + MENU_SETTING_ACTION, 0, 0); + if (settings->bools.menu_content_show_favorites) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES), msg_hash_to_str(MENU_ENUM_LABEL_GOTO_FAVORITES), MENU_ENUM_LABEL_GOTO_FAVORITES, MENU_SETTING_ACTION, 0, 0); + if (settings->bools.menu_content_show_images) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES), msg_hash_to_str(MENU_ENUM_LABEL_GOTO_IMAGES), MENU_ENUM_LABEL_GOTO_IMAGES, MENU_SETTING_ACTION, 0, 0); - + if (settings->bools.menu_content_show_music) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC), msg_hash_to_str(MENU_ENUM_LABEL_GOTO_MUSIC), @@ -6130,6 +6142,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_SETTING_ACTION, 0, 0); #ifdef HAVE_FFMPEG + if (settings->bools.menu_content_show_video) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO), msg_hash_to_str(MENU_ENUM_LABEL_GOTO_VIDEO), @@ -6137,13 +6150,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_SETTING_ACTION, 0, 0); #endif - if (!string_is_empty(settings->paths.directory_menu_content)) - menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FAVORITES), - msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES), - MENU_ENUM_LABEL_FAVORITES, - MENU_SETTING_ACTION, 0, 0); - if (core_info_list_num_info_files(list)) { menu_entries_append_enum(info->list, @@ -6296,32 +6302,36 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) if (frontend_driver_has_fork()) #endif { + if (settings->bools.menu_show_load_core) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_CORE_LIST, PARSE_ACTION, false); } + if (settings->bools.menu_show_load_content) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_LOAD_CONTENT_LIST, PARSE_ACTION, false); + if (settings->bools.menu_content_show_history) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY, PARSE_ACTION, false); + if (settings->bools.menu_content_show_add) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_ADD_CONTENT_LIST, PARSE_ACTION, false); #ifdef HAVE_NETWORKING + if (settings->bools.menu_content_show_netplay) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_NETPLAY, PARSE_ACTION, false); -#endif -#if defined(HAVE_NETWORKING) - if (settings->bools.menu_show_online_updater) - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_ONLINE_UPDATER, - PARSE_ACTION, false); + if (settings->bools.menu_show_online_updater) + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_ONLINE_UPDATER, + PARSE_ACTION, false); #endif menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_SETTINGS, PARSE_ACTION, false); + if (settings->bools.menu_show_information) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_INFORMATION_LIST, PARSE_ACTION, false); @@ -6330,16 +6340,20 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_RESTART_RETROARCH, PARSE_ACTION, false); #endif + if (settings->bools.menu_show_configurations) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_CONFIGURATIONS_LIST, PARSE_ACTION, false); + if (settings->bools.menu_show_help) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_HELP_LIST, PARSE_ACTION, false); + if (settings->bools.menu_show_quit_retroarch) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_QUIT_RETROARCH, PARSE_ACTION, false); #if defined(HAVE_LAKKA) + if (settings->bools.menu_show_reboot) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_REBOOT, PARSE_ACTION, false); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index fd15f28c0c..7b26307956 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5647,7 +5647,8 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 0, XMB_THEME_LAST-1, 1, true, true); - + } +#endif CONFIG_BOOL( list, list_info, &settings->bools.menu_show_load_core, @@ -5737,7 +5738,8 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_NONE); - + +#ifdef HAVE_LAKKA CONFIG_BOOL( list, list_info, &settings->bools.menu_show_reboot, @@ -5752,13 +5754,17 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_NONE); - +#endif + +#ifdef HAVE_XMB + if (string_is_equal_fast(settings->arrays.menu_driver, "xmb", 3)) + { CONFIG_BOOL( list, list_info, - &settings->bools.menu_xmb_show_settings, - MENU_ENUM_LABEL_XMB_SHOW_SETTINGS, - MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, - xmb_show_settings, + &settings->bools.menu_content_show_settings, + MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS, + MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS, + content_show_settings, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -5768,27 +5774,29 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); - - CONFIG_STRING( - list, list_info, - settings->paths.menu_xmb_show_settings_password, - sizeof(settings->paths.menu_xmb_show_settings_password), - MENU_ENUM_LABEL_XMB_SHOW_SETTINGS_PASSWORD, - MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS_PASSWORD, - "", - &group_info, - &subgroup_info, - parent_group, - general_write_handler, - general_read_handler); - settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT | SD_FLAG_LAKKA_ADVANCED); - + + CONFIG_STRING( + list, list_info, + settings->paths.menu_content_show_settings_password, + sizeof(settings->paths.menu_content_show_settings_password), + MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_PASSWORD, + MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD, + "", + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler); + settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT | SD_FLAG_LAKKA_ADVANCED); + } +#endif + CONFIG_BOOL( list, list_info, - &settings->bools.menu_xmb_show_favorites, - MENU_ENUM_LABEL_XMB_SHOW_FAVORITES, - MENU_ENUM_LABEL_VALUE_XMB_SHOW_FAVORITES, - xmb_show_favorites, + &settings->bools.menu_content_show_favorites, + MENU_ENUM_LABEL_CONTENT_SHOW_FAVORITES, + MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_FAVORITES, + content_show_favorites, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -5801,10 +5809,10 @@ static bool setting_append_list( #ifdef HAVE_IMAGEVIEWER CONFIG_BOOL( list, list_info, - &settings->bools.menu_xmb_show_images, - MENU_ENUM_LABEL_XMB_SHOW_IMAGES, - MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, - xmb_show_images, + &settings->bools.menu_content_show_images, + MENU_ENUM_LABEL_CONTENT_SHOW_IMAGES, + MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES, + content_show_images, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -5817,10 +5825,10 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->bools.menu_xmb_show_music, - MENU_ENUM_LABEL_XMB_SHOW_MUSIC, - MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, - xmb_show_music, + &settings->bools.menu_content_show_music, + MENU_ENUM_LABEL_CONTENT_SHOW_MUSIC, + MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC, + content_show_music, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -5833,10 +5841,10 @@ static bool setting_append_list( #ifdef HAVE_FFMPEG CONFIG_BOOL( list, list_info, - &settings->bools.menu_xmb_show_video, - MENU_ENUM_LABEL_XMB_SHOW_VIDEO, - MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, - xmb_show_video, + &settings->bools.menu_content_show_video, + MENU_ENUM_LABEL_CONTENT_SHOW_VIDEO, + MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO, + content_show_video, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -5849,10 +5857,10 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->bools.menu_xmb_show_history, - MENU_ENUM_LABEL_XMB_SHOW_HISTORY, - MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, - xmb_show_history, + &settings->bools.menu_content_show_history, + MENU_ENUM_LABEL_CONTENT_SHOW_HISTORY, + MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY, + content_show_history, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -5865,10 +5873,10 @@ static bool setting_append_list( #ifdef HAVE_NETWORKING CONFIG_BOOL( list, list_info, - &settings->bools.menu_xmb_show_netplay, - MENU_ENUM_LABEL_XMB_SHOW_NETPLAY, - MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, - xmb_show_netplay, + &settings->bools.menu_content_show_netplay, + MENU_ENUM_LABEL_CONTENT_SHOW_NETPLAY, + MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_NETPLAY, + content_show_netplay, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -5882,10 +5890,10 @@ static bool setting_append_list( #ifdef HAVE_LIBRETRODB CONFIG_BOOL( list, list_info, - &settings->bools.menu_xmb_show_add, - MENU_ENUM_LABEL_XMB_SHOW_ADD, - MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, - xmb_show_add, + &settings->bools.menu_content_show_add, + MENU_ENUM_LABEL_CONTENT_SHOW_ADD, + MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD, + content_show_add, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -5895,9 +5903,6 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); -#endif - } - #endif #ifdef HAVE_MATERIALUI diff --git a/msg_hash.h b/msg_hash.h index 698cbe80f4..72a5abf080 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -750,15 +750,15 @@ enum msg_hash_enums MENU_LABEL(XMB_MAIN_MENU_ENABLE_SETTINGS), MENU_LABEL(XMB_MENU_COLOR_THEME), MENU_LABEL(XMB_SHADOWS_ENABLE), - MENU_LABEL(XMB_SHOW_SETTINGS), - MENU_LABEL(XMB_SHOW_SETTINGS_PASSWORD), - MENU_LABEL(XMB_SHOW_FAVORITES), - MENU_LABEL(XMB_SHOW_IMAGES), - MENU_LABEL(XMB_SHOW_MUSIC), - MENU_LABEL(XMB_SHOW_VIDEO), - MENU_LABEL(XMB_SHOW_NETPLAY), - MENU_LABEL(XMB_SHOW_HISTORY), - MENU_LABEL(XMB_SHOW_ADD), + MENU_LABEL(CONTENT_SHOW_SETTINGS), + MENU_LABEL(CONTENT_SHOW_SETTINGS_PASSWORD), + MENU_LABEL(CONTENT_SHOW_FAVORITES), + MENU_LABEL(CONTENT_SHOW_IMAGES), + MENU_LABEL(CONTENT_SHOW_MUSIC), + MENU_LABEL(CONTENT_SHOW_VIDEO), + MENU_LABEL(CONTENT_SHOW_NETPLAY), + MENU_LABEL(CONTENT_SHOW_HISTORY), + MENU_LABEL(CONTENT_SHOW_ADD), MENU_LABEL(XMB_RIBBON_ENABLE), MENU_LABEL(THUMBNAILS), MENU_LABEL(TIMEDATE_ENABLE),