From 2f04b7035a1117ab746135660128888ed5df7b2e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 1 Jul 2016 08:35:12 +0200 Subject: [PATCH] Add more translatable strings --- intl/msg_hash_us.c | 10 ++++++++++ msg_hash.h | 5 +++++ tasks/task_content.c | 27 ++++++++++++++++++--------- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index d5956dccc8..f8b5fb50d7 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -2022,6 +2022,10 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Core options file created successfully."; case MSG_FAILED_TO_CREATE_THE_DIRECTORY: return "Failed to create the directory."; + case MSG_FAILED_TO_EXTRACT_CONTENT_FROM_COMPRESSED_FILE: + return "Failed to extract content from compressed file"; + case MSG_FILE_NOT_FOUND: + return "File not found"; case MSG_ERROR_SAVING_CORE_OPTIONS_FILE: return "Error saving core options file."; case MSG_REMAP_FILE_SAVED_SUCCESSFULLY: @@ -2134,6 +2138,8 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Movie format seems to have a different serializer version. Will most likely fail."; case MSG_CRC32_CHECKSUM_MISMATCH: return "CRC32 checksum mismatch between content file and saved content checksum in replay file header; replay highly likely to desync on playback."; + case MSG_INFLATED_CHECKSUM_DID_NOT_MATCH_CRC32: + return "Inflated checksum did not match CRC32."; case MSG_ERROR_PARSING_ARGUMENTS: return "Error parsing arguments."; case MSG_ERROR: @@ -2346,6 +2352,10 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Downloading"; case MSG_EXTRACTING: return "Extracting"; + case MSG_EXTRACTING_FILE: + return "Extracting file"; + case MSG_NO_CONTENT_STARTING_DUMMY_CORE: + return "No content, starting dummy core."; case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_RATING: return "Edge Magazine Rating"; case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_REVIEW: diff --git a/msg_hash.h b/msg_hash.h index 10cafa4d21..178594d9e4 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -121,6 +121,9 @@ enum msg_hash_enums MSG_USING_CORE_NAME_FOR_NEW_CONFIG, MSG_SAVED_NEW_CONFIG_TO, MSG_FAILED_SAVING_CONFIG_TO, + MSG_INFLATED_CHECKSUM_DID_NOT_MATCH_CRC32, + MSG_FAILED_TO_EXTRACT_CONTENT_FROM_COMPRESSED_FILE, + MSG_FILE_NOT_FOUND, MSG_RESTORED_OLD_SAVE_STATE, MSG_NO_STATE_HAS_BEEN_LOADED_YET, MSG_NO_SAVE_STATE_HAS_BEEN_OVERWRITTEN_YET, @@ -273,6 +276,8 @@ enum msg_hash_enums MSG_TASK_FAILED, MSG_DOWNLOADING, MSG_EXTRACTING, + MSG_EXTRACTING_FILE, + MSG_NO_CONTENT_STARTING_DUMMY_CORE, MENU_ENUM_LABEL_START_NET_RETROPAD, MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD, diff --git a/tasks/task_content.c b/tasks/task_content.c index 28bea65581..4cb8b6d6d3 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -296,7 +296,9 @@ static int content_7zip_file_read( { /* Error handling */ if (!file_found) - RARCH_ERR("File %s not found in %s\n", needle, path); + RARCH_ERR("%s: %s in %s.\n", + msg_hash_to_str(MSG_FILE_NOT_FOUND), + needle, path); RARCH_ERR("Failed to open compressed file inside 7zip archive.\n"); @@ -330,7 +332,7 @@ static struct string_list *compressed_7zip_file_list_new( if (InFile_Open(&archiveStream.file, path)) { - RARCH_ERR("Could not open %s as 7z archive.\n",path); + RARCH_ERR("Could not open as 7zip archive: %s.\n",path); return NULL; } @@ -470,7 +472,8 @@ static bool content_zip_file_decompressed_handle( if (handle->real_checksum != crc32) { - RARCH_ERR("Inflated checksum did not match CRC32!\n"); + RARCH_ERR("%s\n", + msg_hash_to_str(MSG_INFLATED_CHECKSUM_DID_NOT_MATCH_CRC32)); goto error; } @@ -526,7 +529,9 @@ static int content_zip_file_decompressed( if (buf) { - RARCH_LOG("Extracting file : %s\n", st->opt_file); + RARCH_LOG("%s: %s\n", + msg_hash_to_str(MSG_EXTRACTING_FILE), + st->opt_file); memcpy(buf, handle.data, size); if (!filestream_write_file(st->opt_file, buf, size)) @@ -841,7 +846,8 @@ static void content_load_init_wrap( #ifdef HAVE_MENU else { - RARCH_LOG("No content, starting dummy core.\n"); + RARCH_LOG("%s\n", + msg_hash_to_str(MSG_NO_CONTENT_STARTING_DUMMY_CORE)); argv[(*argc)++] = strdup("--menu"); } #endif @@ -1188,7 +1194,8 @@ static bool load_content( else { RARCH_LOG("%s\n", - msg_hash_to_str(MSG_CONTENT_LOADING_SKIPPED_IMPLEMENTATION_WILL_DO_IT)); + msg_hash_to_str( + MSG_CONTENT_LOADING_SKIPPED_IMPLEMENTATION_WILL_DO_IT)); #ifdef HAVE_COMPRESSION if (!load_content_from_compressed_archive( @@ -1251,7 +1258,7 @@ static const struct retro_subsystem_info *init_content_file_subsystem( else if (special->num_roms && special->num_roms != global->subsystem_fullpaths->size) { - RARCH_ERR("libretro core requires %u content files for " + RARCH_ERR("Libretro core requires %u content files for " "subsystem \"%s\", but %u content files were provided.\n", special->num_roms, special->desc, (unsigned)global->subsystem_fullpaths->size); @@ -1260,7 +1267,7 @@ static const struct retro_subsystem_info *init_content_file_subsystem( else if (!special->num_roms && global->subsystem_fullpaths && global->subsystem_fullpaths->size) { - RARCH_ERR("libretro core takes no content for subsystem \"%s\", " + RARCH_ERR("Libretro core takes no content for subsystem \"%s\", " "but %u content files were provided.\n", special->desc, (unsigned)global->subsystem_fullpaths->size); @@ -1318,7 +1325,9 @@ static bool init_content_file_extract( settings->directory.cache : NULL, new_path, sizeof(new_path))) { - RARCH_ERR("Failed to extract content from zipped file: %s.\n", + RARCH_ERR("%s: %s.\n", + msg_hash_to_str( + MSG_FAILED_TO_EXTRACT_CONTENT_FROM_COMPRESSED_FILE), temp_content); return false; }