From f82286ca06378b98c3dbf6b39915df4fea4c5a02 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 25 Jun 2015 16:50:34 +0200 Subject: [PATCH] (Menu) Add more translated strings --- menu/intl/menu_hash_us.c | 30 +++++++++++++++++++++++ menu/menu_displaylist.c | 51 ++++++++++++++++++++++++++-------------- menu/menu_hash.h | 14 +++++++++++ 3 files changed, 78 insertions(+), 17 deletions(-) diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c index 8613e6e9ba..a215cf1e49 100644 --- a/menu/intl/menu_hash_us.c +++ b/menu/intl/menu_hash_us.c @@ -1308,6 +1308,36 @@ const char *menu_hash_to_str_us(uint32_t hash) return "Port"; case MENU_VALUE_NONE: return "None"; + case MENU_LABEL_VALUE_RDB_ENTRY_DEVELOPER: + return "Developer"; + case MENU_LABEL_VALUE_RDB_ENTRY_PUBLISHER: + return "Publisher"; + case MENU_LABEL_VALUE_RDB_ENTRY_DESCRIPTION: + return "Description"; + case MENU_LABEL_VALUE_RDB_ENTRY_NAME: + return "Name"; + case MENU_LABEL_VALUE_RDB_ENTRY_ORIGIN: + return "Origin"; + case MENU_LABEL_VALUE_RDB_ENTRY_FRANCHISE: + return "Franchise"; + case MENU_LABEL_VALUE_RDB_ENTRY_RELEASE_MONTH: + return "Releasedate Month"; + case MENU_LABEL_VALUE_RDB_ENTRY_RELEASE_YEAR: + return "Releasedate Year"; + case MENU_VALUE_TRUE: + return "True"; + case MENU_VALUE_FALSE: + return "False"; + case MENU_VALUE_MISSING: + return "Missing"; + case MENU_VALUE_PRESENT: + return "Present"; + case MENU_VALUE_OPTIONAL: + return "Optional"; + case MENU_VALUE_REQUIRED: + return "Required"; + case MENU_VALUE_STATUS: + return "Status"; default: break; } diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index cf0f218347..fdc4585849 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -219,17 +219,21 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info) { if (core_info->firmware[i].desc) { - snprintf(tmp, sizeof(tmp), " name: %s", + snprintf(tmp, sizeof(tmp), " Name: %s", core_info->firmware[i].desc ? core_info->firmware[i].desc : ""); menu_list_push(info->list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0); - snprintf(tmp, sizeof(tmp), " status: %s, %s", + snprintf(tmp, sizeof(tmp), " %s: %s, %s", + menu_hash_to_str(MENU_VALUE_STATUS), core_info->firmware[i].missing ? - "missing" : "present", + menu_hash_to_str(MENU_VALUE_MISSING) : + menu_hash_to_str(MENU_VALUE_PRESENT), core_info->firmware[i].optional ? - "optional" : "required"); + menu_hash_to_str(MENU_VALUE_OPTIONAL) : + menu_hash_to_str(MENU_VALUE_REQUIRED) + ); menu_list_push(info->list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0); } @@ -1064,7 +1068,9 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) if (db_info_entry->name) { - strlcpy(tmp, "Name", sizeof(tmp)); + strlcpy(tmp, + menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_NAME), + sizeof(tmp)); strlcat(tmp, ": ", sizeof(tmp)); strlcat(tmp, db_info_entry->name, sizeof(tmp)); menu_list_push(info->list, tmp, @@ -1073,7 +1079,9 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) } if (db_info_entry->description) { - strlcpy(tmp, "Description", sizeof(tmp)); + strlcpy(tmp, + menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_DESCRIPTION), + sizeof(tmp)); strlcat(tmp, ": ", sizeof(tmp)); strlcat(tmp, db_info_entry->description, sizeof(tmp)); menu_list_push(info->list, tmp, @@ -1082,7 +1090,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) } if (db_info_entry->publisher) { - if (create_string_list_rdb_entry_string("Publisher", + if (create_string_list_rdb_entry_string( + menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_PUBLISHER), menu_hash_to_str(MENU_LABEL_RDB_ENTRY_PUBLISHER), db_info_entry->publisher, info->path, info->list) == -1) goto error; @@ -1095,7 +1104,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) { if (db_info_entry->developer->elems[k].data) { - if (create_string_list_rdb_entry_string("Developer", + if (create_string_list_rdb_entry_string( + menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_DEVELOPER), menu_hash_to_str(MENU_LABEL_RDB_ENTRY_DEVELOPER), db_info_entry->developer->elems[k].data, info->path, info->list) == -1) @@ -1106,21 +1116,24 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) if (db_info_entry->origin) { - if (create_string_list_rdb_entry_string("Origin", + if (create_string_list_rdb_entry_string( + menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_ORIGIN), menu_hash_to_str(MENU_LABEL_RDB_ENTRY_ORIGIN), db_info_entry->origin, info->path, info->list) == -1) goto error; } if (db_info_entry->franchise) { - if (create_string_list_rdb_entry_string("Franchise", + if (create_string_list_rdb_entry_string( + menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_FRANCHISE), menu_hash_to_str(MENU_LABEL_RDB_ENTRY_FRANCHISE), db_info_entry->franchise, info->path, info->list) == -1) goto error; } if (db_info_entry->max_users) { - if (create_string_list_rdb_entry_int("Max Users", + if (create_string_list_rdb_entry_int( + menu_hash_to_str(MENU_LABEL_VALUE_INPUT_MAX_USERS), menu_hash_to_str(MENU_LABEL_RDB_ENTRY_MAX_USERS), db_info_entry->max_users, info->path, info->list) == -1) @@ -1159,7 +1172,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) } if (db_info_entry->releasemonth) { - if (create_string_list_rdb_entry_int("Releasedate Month", + if (create_string_list_rdb_entry_int( + menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_RELEASE_MONTH), menu_hash_to_str(MENU_LABEL_RDB_ENTRY_RELEASE_MONTH), db_info_entry->releasemonth, info->path, info->list) == -1) @@ -1168,7 +1182,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) if (db_info_entry->releaseyear) { - if (create_string_list_rdb_entry_int("Releasedate Year", + if (create_string_list_rdb_entry_int( + menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_RELEASE_YEAR), menu_hash_to_str(MENU_LABEL_RDB_ENTRY_RELEASE_YEAR), db_info_entry->releaseyear, info->path, info->list) == -1) @@ -1219,16 +1234,18 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) snprintf(tmp, sizeof(tmp), "%s : %s", "Analog supported", - (db_info_entry->analog_supported == 1) ? "true" : - (db_info_entry->analog_supported == -1) ? menu_hash_to_str(MENU_VALUE_NOT_AVAILABLE) : "false"); + (db_info_entry->analog_supported == 1) ? menu_hash_to_str(MENU_VALUE_TRUE) : + (db_info_entry->analog_supported == -1) ? menu_hash_to_str(MENU_VALUE_NOT_AVAILABLE) : + menu_hash_to_str(MENU_VALUE_FALSE)); menu_list_push(info->list, tmp, menu_hash_to_str(MENU_LABEL_RDB_ENTRY_ANALOG), 0, 0, 0); snprintf(tmp, sizeof(tmp), "%s : %s", "Rumble supported", - (db_info_entry->rumble_supported == 1) ? "true" : - (db_info_entry->rumble_supported == -1) ? menu_hash_to_str(MENU_VALUE_NOT_AVAILABLE) : "false"); + (db_info_entry->rumble_supported == 1) ? menu_hash_to_str(MENU_VALUE_TRUE) : + (db_info_entry->rumble_supported == -1) ? menu_hash_to_str(MENU_VALUE_NOT_AVAILABLE) : + menu_hash_to_str(MENU_VALUE_FALSE)); menu_list_push(info->list, tmp, menu_hash_to_str(MENU_LABEL_RDB_ENTRY_RUMBLE), 0, 0, 0); diff --git a/menu/menu_hash.h b/menu/menu_hash.h index ab0e88f904..a6fac19f9b 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -427,11 +427,17 @@ extern "C" { #define MENU_LABEL_RDB_ENTRY_RUMBLE 0xb8ae8ad4U #define MENU_LABEL_RDB_ENTRY_START_CONTENT 0x95025a55U #define MENU_LABEL_RDB_ENTRY_DESCRIPTION 0x26aa1f71U +#define MENU_LABEL_VALUE_RDB_ENTRY_DESCRIPTION 0xe61a1f69U #define MENU_LABEL_RDB_ENTRY_NAME 0xc6ccf92eU +#define MENU_LABEL_VALUE_RDB_ENTRY_NAME 0x7c898026U #define MENU_LABEL_RDB_ENTRY_PUBLISHER 0x4d7bcdfbU +#define MENU_LABEL_VALUE_RDB_ENTRY_PUBLISHER 0xce7b6ff3U #define MENU_LABEL_RDB_ENTRY_DEVELOPER 0x06f61093U +#define MENU_LABEL_VALUE_RDB_ENTRY_DEVELOPER 0x87f5b28bU #define MENU_LABEL_RDB_ENTRY_ORIGIN 0xb176aad5U +#define MENU_LABEL_VALUE_RDB_ENTRY_ORIGIN 0xc870cfcdU #define MENU_LABEL_RDB_ENTRY_FRANCHISE 0xb31764a0U +#define MENU_LABEL_VALUE_RDB_ENTRY_FRANCHISE 0x34170698U #define MENU_LABEL_RDB_ENTRY_ENHANCEMENT_HW 0x79ee4f11U #define MENU_LABEL_RDB_ENTRY_ESRB_RATING 0xe138fa3dU #define MENU_LABEL_RDB_ENTRY_BBFC_RATING 0x82dbc01eU @@ -443,8 +449,11 @@ extern "C" { #define MENU_LABEL_RDB_ENTRY_EDGE_MAGAZINE_REVIEW 0x977f6fdeU #define MENU_LABEL_RDB_ENTRY_FAMITSU_MAGAZINE_RATING 0x01a50315U #define MENU_LABEL_RDB_ENTRY_RELEASE_MONTH 0xad2f2c54U +#define MENU_LABEL_VALUE_RDB_ENTRY_RELEASE_MONTH 0xb68af36aU #define MENU_LABEL_RDB_ENTRY_RELEASE_YEAR 0x14c9c6bfU +#define MENU_LABEL_VALUE_RDB_ENTRY_RELEASE_YEAR 0x439e0315U #define MENU_LABEL_RDB_ENTRY_MAX_USERS 0xfae91cc4U +#define MENU_LABEL_VALUE_RDB_ENTRY_MAX_USERS 0xe6b0aefdU #define MENU_LABEL_RDB_ENTRY_SHA1 0xc6cfd31aU #define MENU_LABEL_VALUE_RDB_ENTRY_SHA1 0x2d142625U #define MENU_LABEL_VALUE_RDB_ENTRY_MD5 0xf1ecb7deU @@ -479,6 +488,10 @@ extern "C" { #define MENU_VALUE_CORE 0x6a167f7fU #define MENU_VALUE_CURSOR 0x57bba8b4U #define MENU_VALUE_FILE 0x6a496536U +#define MENU_VALUE_MISSING 0x28536c3fU +#define MENU_VALUE_PRESENT 0x23432826U +#define MENU_VALUE_OPTIONAL 0x27bfc4abU +#define MENU_VALUE_REQUIRED 0x979b1a66U #define MENU_VALUE_RDB 0x0b00f54eU #define MENU_VALUE_DIR 0x0af95f55U #define MENU_VALUE_NO_CORE 0x7d5472cbU @@ -821,6 +834,7 @@ extern "C" { #define MENU_LABEL_VALUE_RECORD_ENABLE 0xee39aa6bU #define MENU_VALUE_SECONDS 0x8b0028d4U +#define MENU_VALUE_STATUS 0xd1e57929U #define MENU_LABEL_VALUE_CORE_INFO_CORE_NAME 0x2a031110U #define MENU_LABEL_VALUE_CORE_INFO_CORE_LABEL 0x6a40d38fU