From 6354d7ee5ff119dc4be39ce8dc2800c540d5eef4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 13 Dec 2016 01:06:28 +0100 Subject: [PATCH] Rename 'Select File' to 'Favorites' --- intl/msg_hash_chs.c | 4 ++-- intl/msg_hash_de.h | 4 ++-- intl/msg_hash_eo.h | 4 ++-- intl/msg_hash_es.c | 4 ++-- intl/msg_hash_fr.h | 4 ++-- intl/msg_hash_it.c | 4 ++-- intl/msg_hash_ja.h | 4 ++-- intl/msg_hash_lbl.h | 4 ++-- intl/msg_hash_nl.h | 4 ++-- intl/msg_hash_pl.c | 2 +- intl/msg_hash_pt.c | 4 ++-- intl/msg_hash_ru.h | 4 ++-- intl/msg_hash_us.h | 4 ++-- intl/msg_hash_vn.c | 4 ++-- menu/cbs/menu_cbs_deferred_push.c | 2 +- menu/cbs/menu_cbs_get_value.c | 2 +- menu/cbs/menu_cbs_ok.c | 14 +++++++------- menu/cbs/menu_cbs_title.c | 2 +- menu/drivers/materialui.c | 6 +++--- menu/drivers/xmb.c | 2 +- menu/menu_displaylist.c | 11 ++++++----- msg_hash.h | 3 ++- 22 files changed, 49 insertions(+), 47 deletions(-) diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index 3071107e6b..fd0ef1df5b 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -2116,8 +2116,8 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg) return "选择数据库"; case MENU_ENUM_LABEL_VALUE_DELETE_ENTRY: return "移除"; - case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST: - return "选择文件并探测核心"; + case MENU_ENUM_LABEL_VALUE_FAVORITES: + return "选择文件并探测核心"; /* TODO/FIXME - update */ case MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT: return "<游戏内容目录>"; case MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT: diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 0f56a79ab8..f14d94adc9 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -146,8 +146,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER, "Datenbankmanager") MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, "Von der Playlist löschen") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST, - "Lade Content") +MSG_HASH(MENU_ENUM_LABEL_VALUE_FAVORITES, + "Lesezeichen") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT, "") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT, diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 7d59beaea6..6ebaf86f80 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -484,8 +484,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION, "Database Selection") MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, "Remove") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST, - "Select File") +MSG_HASH(MENU_ENUM_LABEL_VALUE_FAVORITES, + "Favorites") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT, "") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT, diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index 597ec252f8..478c410e32 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -1653,8 +1653,8 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg) return "Proporción personalizada"; case MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER: return "Gestor de bases de datos"; - case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST: - return "Seleccionar archivo y detectar núcleo"; + case MENU_ENUM_LABEL_VALUE_FAVORITES: + return "Seleccionar archivo y detectar núcleo"; /* TODO/FIXME - update */ case MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT: return "(Carpeta de contenido)"; case MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT: diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 72ae42d881..107d9c1148 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -480,8 +480,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION, "Database Selection") MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, "Remove") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST, - "Via les fichiers") +MSG_HASH(MENU_ENUM_LABEL_VALUE_FAVORITES, + "Via les fichiers") /* TODO/FIXME - update */ MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT, "") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT, diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index ea90c6ac77..480fad296c 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -1611,8 +1611,8 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg) return "Abilita riavvolgi"; case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST: return "Collezione"; - case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST: - return "Seleziona il file ed intercetta il core"; + case MENU_ENUM_LABEL_VALUE_FAVORITES: + return "Seleziona il file ed intercetta il core"; /* TODO/FIXME - update */ case MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST: return "Scarica su directories"; case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY: diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 1661a6df37..26cc96c72d 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -498,8 +498,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION, "Database Selection") MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, "削除") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST, - "ファイルを選択とコア検出") +MSG_HASH(MENU_ENUM_LABEL_VALUE_FAVORITES, + "ファイルを選択とコア検出") /* TODO/FIXME - update */ MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT, "") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT, diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 7d8fd98f7d..58bb2b135f 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -307,8 +307,8 @@ MSG_HASH(MENU_ENUM_LABEL_DEFERRED_WIFI_SETTINGS_LIST, "deferred_wifi_settings_list") MSG_HASH(MENU_ENUM_LABEL_DELETE_ENTRY, "delete_entry") -MSG_HASH(MENU_ENUM_LABEL_DETECT_CORE_LIST, - "detect_core_list") +MSG_HASH(MENU_ENUM_LABEL_FAVORITES, + "favorites") MSG_HASH(MENU_ENUM_LABEL_DIRECTORY_SETTINGS, "directory_settings") MSG_HASH(MENU_ENUM_LABEL_DISK_CYCLE_TRAY_STATUS, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 121122af4d..ba2abb1167 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -484,8 +484,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION, "Database Selectie") MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, "Verwijderen") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST, - "Selecteer Bestand") +MSG_HASH(MENU_ENUM_LABEL_VALUE_FAVORITES, + "Favorieten") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT, "") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT, diff --git a/intl/msg_hash_pl.c b/intl/msg_hash_pl.c index 60da28dd16..bee8cf1bc7 100644 --- a/intl/msg_hash_pl.c +++ b/intl/msg_hash_pl.c @@ -176,7 +176,7 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg) return "Włąsny współczynnik"; case MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER: return "Menedżer bazy danych"; - case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST: + case MENU_ENUM_LABEL_VALUE_FAVORITES: /* TODO/FIXME - update */ return "Wybierz plik i dopasuj rdzeń"; case MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT: return ""; diff --git a/intl/msg_hash_pt.c b/intl/msg_hash_pt.c index d3d895f85f..a720feee37 100644 --- a/intl/msg_hash_pt.c +++ b/intl/msg_hash_pt.c @@ -1094,8 +1094,8 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg) return "Relação de Aspecto Personalizada"; case MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER: return "Gerenciador de Databases"; - case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST: - return "Selecionar Arquivo e Detectar Core"; + case MENU_ENUM_LABEL_VALUE_FAVORITES: + return "Selecionar Arquivo e Detectar Core"; /* TODO/FIXME - update */ case MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT: return ""; case MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT: diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index a98010cde3..413c096a39 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -484,8 +484,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION, "Database Selection") MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, "Remove") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST, - "Select File") +MSG_HASH(MENU_ENUM_LABEL_VALUE_FAVORITES, + "Favorites") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT, "") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index f5ec34fa09..b785717911 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -488,8 +488,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION, "Database Selection") MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, "Remove") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST, - "Select File") +MSG_HASH(MENU_ENUM_LABEL_VALUE_FAVORITES, + "Favorites") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT, "") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 12daf54ef0..30915360e2 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -2162,8 +2162,8 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) return "Database Selection"; case MENU_ENUM_LABEL_VALUE_DELETE_ENTRY: return "Remove"; - case MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST: - return "Select File And Detect Core"; + case MENU_ENUM_LABEL_VALUE_FAVORITES: + return "Favorites"; case MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT: return ""; case MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT: diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index e7e397d4f1..a8b905b690 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -1118,7 +1118,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label( BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_settings_list); break; case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: - case MENU_ENUM_LABEL_DETECT_CORE_LIST: + case MENU_ENUM_LABEL_FAVORITES: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_detect_core_list); break; default: diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 361d88808b..6b547c8a8d 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -1703,7 +1703,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_label( case MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST: case MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY: case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: - case MENU_ENUM_LABEL_DETECT_CORE_LIST: + case MENU_ENUM_LABEL_FAVORITES: case MENU_ENUM_LABEL_CORE_OPTIONS: case MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS: case MENU_ENUM_LABEL_SHADER_OPTIONS: diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index e882c92855..faf3c69753 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -3123,7 +3123,7 @@ static int action_ok_push_random_dir(const char *path, { settings_t *settings = config_get_ptr(); return generic_action_ok_displaylist_push(path, path, - msg_hash_to_str(MENU_ENUM_LABEL_DETECT_CORE_LIST), + msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES), type, idx, entry_idx, ACTION_OK_DL_CONTENT_LIST); } @@ -3134,7 +3134,7 @@ static int action_ok_push_downloads_dir(const char *path, settings_t *settings = config_get_ptr(); filebrowser_types = FILEBROWSER_NONE; return generic_action_ok_displaylist_push(path, settings->directory.core_assets, - msg_hash_to_str(MENU_ENUM_LABEL_DETECT_CORE_LIST), + msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES), type, idx, entry_idx, ACTION_OK_DL_CONTENT_LIST); } @@ -3819,7 +3819,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, BIND_ACTION_OK(cbs, action_ok_scan_directory_list); break; case MENU_ENUM_LABEL_SCAN_FILE: - case MENU_ENUM_LABEL_DETECT_CORE_LIST: + case MENU_ENUM_LABEL_FAVORITES: BIND_ACTION_OK(cbs, action_ok_push_content_list); break; case MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR: @@ -4029,7 +4029,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, break; case MENU_LABEL_SCAN_FILE: case MENU_LABEL_SCAN_DIRECTORY: - case MENU_LABEL_DETECT_CORE_LIST: + case MENU_LABEL_FAVORITES: BIND_ACTION_OK(cbs, action_ok_push_content_list); break; case MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: @@ -4164,7 +4164,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs, case FILE_TYPE_CARCHIVE: switch (menu_label_hash) { - case MENU_LABEL_DETECT_CORE_LIST: + case MENU_LABEL_FAVORITES: BIND_ACTION_OK(cbs, action_ok_compressed_archive_push_detect_core); break; case MENU_LABEL_SCAN_FILE: @@ -4276,7 +4276,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs, break; #endif case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: - case MENU_ENUM_LABEL_DETECT_CORE_LIST: + case MENU_ENUM_LABEL_FAVORITES: case MENU_ENUM_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE: #ifdef HAVE_COMPRESSION if (type == FILE_TYPE_IN_CARCHIVE) @@ -4307,7 +4307,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs, break; #endif case MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: - case MENU_LABEL_DETECT_CORE_LIST: + case MENU_LABEL_FAVORITES: case MENU_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE: #ifdef HAVE_COMPRESSION if (type == FILE_TYPE_IN_CARCHIVE) diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 67bc323dbb..83736870f4 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -229,7 +229,7 @@ default_title_generic_macro(action_get_title_list_rdb_entry_database_info,MENU_E static int action_get_title_default(const char *path, const char *label, unsigned menu_type, char *s, size_t len) { - snprintf(s, len, "%s %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST), path); + snprintf(s, len, "%s %s", "Select File", path); return 0; } diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 888b7e50b7..0258810844 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -1676,9 +1676,9 @@ static int mui_list_push(void *data, void *userdata, menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST), - msg_hash_to_str(MENU_ENUM_LABEL_DETECT_CORE_LIST), - MENU_ENUM_LABEL_DETECT_CORE_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); core_info_get_list(&list); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 7e883ade53..7dc829aa02 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1867,7 +1867,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE: case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME: return xmb->textures.list[XMB_TEXTURE_SAVESTATE]; - case MENU_ENUM_LABEL_DETECT_CORE_LIST: + case MENU_ENUM_LABEL_FAVORITES: case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: return xmb->textures.list[XMB_TEXTURE_FOLDER]; default: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index fe35b02170..15d29cbc6e 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5526,11 +5526,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR, MENU_SETTING_ACTION, 0, 0); - menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST), - msg_hash_to_str(MENU_ENUM_LABEL_DETECT_CORE_LIST), - MENU_ENUM_LABEL_DETECT_CORE_LIST, - MENU_SETTING_ACTION, 0, 0); + if (!string_is_empty(settings->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)) { diff --git a/msg_hash.h b/msg_hash.h index d39f31f06c..77117e1819 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1171,7 +1171,7 @@ enum msg_hash_enums MENU_LABEL(DETECT_CORE_LIST_OK_CURRENT_CORE), MENU_LABEL(DETECT_CORE_LIST_OK), - MENU_LABEL(DETECT_CORE_LIST), + MENU_LABEL(FAVORITES), MENU_LABEL(START_CORE), MENU_LABEL(CORE_UPDATER_LIST), MENU_LABEL(CORE_UPDATER_AUTO_EXTRACT_ARCHIVE), @@ -1695,6 +1695,7 @@ enum msg_hash_enums #define MENU_LABEL_RDB_ENTRY_RELEASE_YEAR 0x14c9c6bfU #define MENU_LABEL_RDB_ENTRY_MAX_USERS 0xfae91cc4U +#define MENU_LABEL_FAVORITES 0x67325138U #define MENU_LABEL_DETECT_CORE_LIST 0xaa07c341U #define MENU_LABEL_DETECT_CORE_LIST_OK 0xabba2a7aU #define MENU_LABEL_CORE_LIST 0xa22bb14dU