From 780928a6277a25c2a445ae31f01bd84854d38bad Mon Sep 17 00:00:00 2001 From: lasers Date: Sat, 29 Oct 2016 04:29:26 -0500 Subject: [PATCH] Move "Download Content" under "Online Updater" as "Content Downloader" Rename "Add Content" to "Scan Content" as it does not always add everything. Rephrase strings for new "Content Downloader" and "Scan Content" --- intl/msg_hash_us.c | 8 ++++---- menu/menu_displaylist.c | 14 ++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 8364602bff..951d6e09a3 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -3054,7 +3054,7 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) case MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY: return "Reduces latency at the cost of higher risk of video stuttering. Adds a delay after V-Sync (in ms)."; case MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST: - return "Download and/or scan content, and add it to your collection."; + return "Scan contents and add to the database."; case MENU_ENUM_SUBLABEL_NETPLAY: return "Join or host a netplay session."; case MENU_ENUM_SUBLABEL_FPS_SHOW: @@ -3082,7 +3082,7 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) case MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES: return "Tells the video driver to explicitly use a specified buffering mode."; case MENU_ENUM_SUBLABEL_ONLINE_UPDATER: - return "Download and update add-ons and components for RetroArch."; + return "Download add-ons, components and contents for RetroArch."; case MENU_ENUM_SUBLABEL_INPUT_USER_BINDS: return "Configure controls for this user."; case MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS: @@ -3672,7 +3672,7 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES: return "Update Core Info Files"; case MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT: - return "Download Content"; + return "Content Downloader"; case MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE: return "Download Core..."; case MENU_ENUM_LABEL_VALUE_SCAN_THIS_DIRECTORY: @@ -3682,7 +3682,7 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY: return "Scan Directory"; case MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST: - return "Add Content"; + return "Scan Content"; case MENU_ENUM_LABEL_VALUE_INFORMATION: return "Information"; case MENU_ENUM_LABEL_VALUE_INFORMATION_LIST: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 2789dd1e07..4f8d0cbf34 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2872,14 +2872,6 @@ static int menu_displaylist_parse_information_list( static int menu_displaylist_parse_add_content_list( menu_displaylist_info_t *info) { -#ifdef HAVE_NETWORKING - menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT), - msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS), - MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS, - MENU_SETTING_ACTION, 0, 0); -#endif - #ifdef HAVE_LIBRETRODB menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY), @@ -2951,6 +2943,12 @@ static int menu_displaylist_parse_options( MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST, MENU_SETTING_ACTION, 0, 0); + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT), + msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS), + MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS, + MENU_SETTING_ACTION, 0, 0); + #if !defined(VITA) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES),