diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 74256aec95..8105929200 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -1976,6 +1976,16 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) { case MSG_PROGRAM: return "RetroArch"; + case MSG_LIBRETRO_FRONTEND: + return "Frontend for libretro"; + case MSG_REVERTING_SAVEFILE_DIRECTORY_TO: + return "Reverting savefile directory to"; + case MSG_REVERTING_SAVESTATE_DIRECTORY_TO: + return "Reverting savestate directory to"; + case MSG_ERROR_PARSING_ARGUMENTS: + return "Error parsing arguments."; + case MSG_FATAL_ERROR_RECEIVED_IN: + return "Fatal error received in"; case MSG_MOVIE_RECORD_STOPPED: return "Stopping movie record."; case MSG_MOVIE_PLAYBACK_ENDED: diff --git a/msg_hash.h b/msg_hash.h index 1bbcd8d3bd..8080251ef6 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -27,15 +27,20 @@ RETRO_BEGIN_DECLS enum msg_hash_enums { MSG_UNKNOWN = 0, + MSG_LIBRETRO_FRONTEND, MSG_PROGRAM, MSG_FOUND_SHADER, MSG_LOADING_HISTORY_FILE, MSG_SRAM_WILL_NOT_BE_SAVED, MSG_RECEIVED, MSG_LOADING_CONTENT_FILE, + MSG_FATAL_ERROR_RECEIVED_IN, MSG_USING_LIBRETRO_DUMMY_CORE_RECORDING_SKIPPED, MSG_RECORDING_TERMINATED_DUE_TO_RESIZE, MSG_FAILED_TO_START_RECORDING, + MSG_REVERTING_SAVEFILE_DIRECTORY_TO, + MSG_ERROR_PARSING_ARGUMENTS, + MSG_REVERTING_SAVESTATE_DIRECTORY_TO, MSG_REWIND_INIT, MSG_REWIND_INIT_FAILED, MSG_REWIND_INIT_FAILED_THREADED_AUDIO, diff --git a/retroarch.c b/retroarch.c index 4f41bba638..cca3c12c57 100644 --- a/retroarch.c +++ b/retroarch.c @@ -177,8 +177,10 @@ static void retroarch_print_version(void) { char str[PATH_MAX_LENGTH] = {0}; - fprintf(stderr, "%s: Frontend for libretro -- v%s", - msg_hash_to_str(MSG_PROGRAM), PACKAGE_VERSION); + fprintf(stderr, "%s: %s -- v%s", + msg_hash_to_str(MSG_PROGRAM), + msg_hash_to_str(MSG_LIBRETRO_FRONTEND), + PACKAGE_VERSION); #ifdef HAVE_GIT_VERSION printf(" -- %s --\n", retroarch_git_version); #endif @@ -403,10 +405,7 @@ static void retroarch_set_paths_redirect(void) runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &info); if (!global) - { - RARCH_WARN("retroarch_set_paths_redirect was sent a NULL \"global\" pointer."); return; - } if (info->info.library_name && !string_is_empty(info->info.library_name)) @@ -448,7 +447,8 @@ static void retroarch_set_paths_redirect(void) path_mkdir(current_savefile_dir); if(!path_is_directory(current_savefile_dir)) { - RARCH_LOG("Reverting savefile directory to %s\n", + RARCH_LOG("%s %s\n", + msg_hash_to_str(MSG_REVERTING_SAVEFILE_DIRECTORY_TO), global->dir.savefile); strlcpy(current_savefile_dir, @@ -476,7 +476,8 @@ static void retroarch_set_paths_redirect(void) path_mkdir(current_savestate_dir); if(!path_is_directory(current_savestate_dir)) { - RARCH_LOG("Reverting savestate directory to %s\n", + RARCH_LOG("%s %s\n", + msg_hash_to_str(MSG_REVERTING_SAVESTATE_DIRECTORY_TO), global->dir.savestate); strlcpy(current_savestate_dir, global->dir.savestate, @@ -1022,7 +1023,7 @@ static void retroarch_parse_input(int argc, char *argv[]) retroarch_fail(1, "retroarch_parse_input()"); default: - RARCH_ERR("Error parsing arguments.\n"); + RARCH_ERR("%s\n", msg_hash_to_str(MSG_ERROR_PARSING_ARGUMENTS)); retroarch_fail(1, "retroarch_parse_input()"); } } @@ -1250,7 +1251,8 @@ bool retroarch_main_init(int argc, char *argv[]) if (setjmp(error_sjlj_context) > 0) { - RARCH_ERR("Fatal error received in: \"%s\"\n", error_string); + RARCH_ERR("%s: \"%s\"\n", + msg_hash_to_str(MSG_FATAL_ERROR_RECEIVED_IN), error_string); return false; }