From 085ae4de554d36565a8190af39e1fd54052ab673 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 4 Jul 2015 17:06:12 +0200
Subject: [PATCH] Fix some labels

---
 menu/cbs/menu_cbs_title.c | 11 +----------
 menu/intl/menu_hash_us.c  |  6 +++---
 menu/menu_hash.h          |  6 +++---
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 45ccf55447..739c64d75b 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -125,13 +125,6 @@ static int action_get_title_custom_viewport(const char *path, const char *label,
    return 0;
 }
 
-static int action_get_title_content_collection_list(const char *path, const char *label, 
-      unsigned menu_type, char *s, size_t len)
-{
-   strlcpy(s, "CONTENT COLLECTION LIST", len);
-   return 0;
-}
-
 static int action_get_title_video_shader_preset(const char *path, const char *label, 
       unsigned menu_type, char *s, size_t len)
 {
@@ -664,6 +657,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
       case MENU_LABEL_DATABASE_MANAGER_LIST:
       case MENU_LABEL_CURSOR_MANAGER_LIST:
       case MENU_LABEL_DEFERRED_CORE_UPDATER_LIST:
+      case MENU_LABEL_CONTENT_COLLECTION_LIST:
       case MENU_LABEL_INFORMATION_LIST:
       case MENU_LABEL_LOAD_CONTENT_LIST:
       case MENU_LABEL_CONTENT_SETTINGS:
@@ -681,9 +675,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
       case MENU_LABEL_REMAP_FILE_LOAD:
          cbs->action_get_title = action_get_title_remap_file_load;
          break;
-      case MENU_LABEL_CONTENT_COLLECTION_LIST:
-         cbs->action_get_title = action_get_title_content_collection_list;
-         break;
       case MENU_LABEL_CUSTOM_VIEWPORT_2:
          cbs->action_get_title = action_get_title_custom_viewport;
          break;
diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c
index e81c206693..8bd38428e3 100644
--- a/menu/intl/menu_hash_us.c
+++ b/menu/intl/menu_hash_us.c
@@ -351,11 +351,11 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
       case MENU_LABEL_REWIND_ENABLE:
          return "rewind_enable";
       case MENU_LABEL_CONTENT_COLLECTION_LIST:
-         return "content_collection_list";
+         return "select_from_collection";
       case MENU_LABEL_DETECT_CORE_LIST:
          return "detect_core_list";
       case MENU_LABEL_LOAD_CONTENT_HISTORY:
-         return "history_list";
+         return "load_recent";
       case MENU_LABEL_AUDIO_ENABLE:
          return "audio_enable";
       case MENU_LABEL_FPS_SHOW:
@@ -509,7 +509,7 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
       case MENU_LABEL_CORE_INFORMATION:
          return "core_information";
       case MENU_LABEL_CORE_LIST:
-         return "program_core_list";
+         return "load_core";
       case MENU_LABEL_LOAD_CONTENT:
          return "load_content_default";
       case MENU_LABEL_CLOSE_CONTENT:
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 143893bcbb..df363910a4 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -610,7 +610,7 @@ extern "C" {
 #define MENU_LABEL_DEFERRED_CORE_UPDATER_LIST                                  0xbd4d493dU
 #define MENU_LABEL_CONFIGURATIONS                                              0x3e930a50U
 #define MENU_LABEL_DISK_IMAGE_APPEND                                           0x5af7d709U
-#define MENU_LABEL_CORE_LIST                                                   0xac9dbf00U
+#define MENU_LABEL_CORE_LIST                                                   0xa22bb14dU
 #define MENU_LABEL_VALUE_CORE_LIST                                             0x0e17fd4eU
 #define MENU_LABEL_MANAGEMENT                                                  0x2516c88aU
 #define MENU_LABEL_VALUE_MANAGEMENT                                            0x97001d0bU
@@ -621,7 +621,7 @@ extern "C" {
 #define MENU_LABEL_VALUE_FRONTEND_COUNTERS                                     0x5752bcf8U
 #define MENU_LABEL_VALUE_CORE_COUNTERS                                         0x4610e861U
 #define MENU_LABEL_CORE_COUNTERS                                               0x64cc83e0U
-#define MENU_LABEL_LOAD_CONTENT_HISTORY                                        0x60d82032U
+#define MENU_LABEL_LOAD_CONTENT_HISTORY                                        0xfe1d79e5U
 #define MENU_LABEL_VALUE_LOAD_CONTENT_HISTORY                                  0x5b362286U
 #define MENU_LABEL_INFO_SCREEN                                                 0xd97853d0U
 #define MENU_LABEL_SYSTEM_INFORMATION                                          0x206ebf0fU
@@ -821,7 +821,7 @@ extern "C" {
 #define MENU_LABEL_VALUE_REMAP_FILE_SAVE_GAME                                  0x9c487623U
 #define MENU_LABEL_REMAP_FILE_SAVE_CORE                                        0x7c9d4c8fU
 #define MENU_LABEL_REMAP_FILE_SAVE_GAME                                        0x7c9f41e0U
-#define MENU_LABEL_CONTENT_COLLECTION_LIST                                     0x0f8a9086U
+#define MENU_LABEL_CONTENT_COLLECTION_LIST                                     0x32d1df83U
 #define MENU_LABEL_VALUE_CONTENT_COLLECTION_LIST                               0xdb177ea0U
 #define MENU_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE                        0xbae7be3eU
 #define MENU_LABEL_OSK_ENABLE                                                  0x8e208498U