From e4fd727687973dbc4a89d12b87d7f06aac51fdb0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 20 Oct 2016 18:23:34 +0200 Subject: [PATCH] More translated strings --- command.c | 22 +++++++++++++++------- intl/msg_hash_us.c | 10 ++++++++++ msg_hash.h | 5 +++++ 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/command.c b/command.c index 31b747e3fb..00d76ce5c0 100644 --- a/command.c +++ b/command.c @@ -403,7 +403,8 @@ static bool command_network_init(command_t *handle, uint16_t port) if (!socket_bind(handle->net_fd, (void*)res)) { - RARCH_ERR("Failed to bind socket.\n"); + RARCH_ERR("%s.\n", + msg_hash_to_str(MSG_FAILED_TO_BIND_SOCKET)); goto error; } @@ -1231,7 +1232,8 @@ static void command_event_load_auto_state(void) ret = content_load_state(savestate_name_auto, false, true); - RARCH_LOG("Found auto savestate in: %s\n", savestate_name_auto); + RARCH_LOG("%s: %s\n", msg_hash_to_str(MSG_FOUND_AUTO_SAVESTATE_IN), + savestate_name_auto); snprintf(msg, sizeof(msg), "%s \"%s\" %s.", msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_FROM), @@ -1315,7 +1317,7 @@ static bool event_init_content(void) { #ifdef HAVE_NETWORKING if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL)) - RARCH_ERR("sorry, unimplemented: cores that don't demand content cannot participate in netplay\n"); + RARCH_ERR("%s\n", msg_hash_to_str(MSG_SORRY_UNIMPLEMENTED_CORES_DONT_DEMAND_CONTENT_NETPLAY)); #endif return true; } @@ -1400,7 +1402,8 @@ static void command_event_restore_default_shader_preset(void) /* auto shader preset: reload the original shader */ settings_t *settings = config_get_ptr(); - RARCH_LOG("Shaders: restoring default shader preset to %s\n", + RARCH_LOG("%s %s\n", + msg_hash_to_str(MSG_RESTORING_DEFAULT_SHADER_PRESET_TO), path_get(RARCH_PATH_DEFAULT_SHADER_PRESET)); strlcpy(settings->path.shader, path_get(RARCH_PATH_DEFAULT_SHADER_PRESET), @@ -1436,7 +1439,9 @@ static bool command_event_save_auto_state(void) sizeof(savestate_name_auto)); ret = content_save_state((const char*)savestate_name_auto, true, true); - RARCH_LOG("Auto save state to \"%s\" %s.\n", savestate_name_auto, ret ? + RARCH_LOG("%s \"%s\" %s.\n", + msg_hash_to_str(MSG_AUTO_SAVE_STATE_TO), + savestate_name_auto, ret ? "succeeded" : "failed"); return true; @@ -1757,9 +1762,12 @@ bool command_event(enum event_command cmd, void *data) video_driver_set_video_mode(width, height, true); if (width == 0 || height == 0) - strlcpy(msg, "Resolution: DEFAULT", sizeof(msg)); + snprintf(msg, sizeof(msg), "%s: DEFAULT", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION)); else - snprintf(msg, sizeof(msg),"Resolution: %dx%d",width, height); + snprintf(msg, sizeof(msg),"%s: %dx%d", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION), + width, height); runloop_msg_queue_push(msg, 1, 100, true); } } diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index b095873d3d..7002c1bd9b 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -3113,6 +3113,12 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Loading"; case MSG_GAME_SPECIFIC_CORE_OPTIONS_FOUND_AT: return "Per-Game Options: game-specific core options found at"; + case MSG_RESTORING_DEFAULT_SHADER_PRESET_TO: + return "Shaders: restoring default shader preset to"; + case MSG_SORRY_UNIMPLEMENTED_CORES_DONT_DEMAND_CONTENT_NETPLAY: + return "Sorry, unimplemented: cores that don't demand content cannot participate in netplay."; + case MSG_FOUND_AUTO_SAVESTATE_IN: + return "Found auto savestate in"; case MSG_AUTOLOADING_SAVESTATE_FROM: return "Auto-loading savestate from"; case MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_PORT: @@ -3397,6 +3403,8 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Audio unmuted."; case MSG_RESET: return "Reset"; + case MSG_AUTO_SAVE_STATE_TO: + return "Auto save state to"; case MSG_FAILED_TO_LOAD_STATE: return "Failed to load state from"; case MSG_FAILED_TO_SAVE_STATE_TO: @@ -4483,6 +4491,8 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "No"; case MENU_ENUM_LABEL_VALUE_BACK: return "BACK"; + case MSG_FAILED_TO_BIND_SOCKET: + return "Failed to bind socket."; case MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION: return "Screen Resolution"; case MENU_ENUM_LABEL_VALUE_DISABLED: diff --git a/msg_hash.h b/msg_hash.h index cc5fd377d6..8f85e25577 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -203,7 +203,12 @@ enum msg_hash_enums MSG_AUTOCONFIG_FILE_ERROR_SAVING, MSG_OVERRIDES_ERROR_SAVING, MSG_AUTOLOADING_SAVESTATE_FROM, + MSG_FOUND_AUTO_SAVESTATE_IN, MSG_SRAM_WILL_NOT_BE_SAVED, + MSG_FAILED_TO_BIND_SOCKET, + MSG_AUTO_SAVE_STATE_TO, + MSG_RESTORING_DEFAULT_SHADER_PRESET_TO, + MSG_SORRY_UNIMPLEMENTED_CORES_DONT_DEMAND_CONTENT_NETPLAY, MSG_RECEIVED, MSG_LOADING_CONTENT_FILE, MSG_FATAL_ERROR_RECEIVED_IN,