libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #3891 from lasers/move-dl-content

Browse Source 
Merge "Update/Download" and rename "Add Content"
This commit is contained in:
Twinaphex 2016-10-29 14:28:58 +02:00 committed by GitHub
commit 528950b433
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intl/msg_hash_us.c
View File

@ -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:

14
menu/menu_displaylist.c
View File

@ -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),