From 39d413be8f85825bb7b532fb85ae4f31c41452e2 Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Tue, 25 Oct 2016 00:03:25 -0400 Subject: [PATCH] update jp translation, move some hardcoded text to enums --- intl/japanese.h | 4 ++-- intl/msg_hash_jp.c | 24 ++++++++++++++++++------ intl/msg_hash_us.c | 12 ++++++++++++ menu/menu_setting.c | 18 ++++++++++++------ msg_hash.h | 7 +++++++ 5 files changed, 51 insertions(+), 14 deletions(-) diff --git a/intl/japanese.h b/intl/japanese.h index 2c94e84c86..6db1617ad0 100644 --- a/intl/japanese.h +++ b/intl/japanese.h @@ -74,8 +74,8 @@ #define RETRO_LBL_VOLUME_DOWN "音量を減る" #define RETRO_LBL_OVERLAY_NEXT "次のオーバーレイ" #define RETRO_LBL_DISK_EJECT_TOGGLE "ディスクを取り出し" -#define RETRO_LBL_DISK_NEXT "次のディスクを切り替え" -#define RETRO_LBL_DISK_PREV "前のディスクを切り替え" +#define RETRO_LBL_DISK_NEXT "次のディスクに切り替え" +#define RETRO_LBL_DISK_PREV "前のディスクに切り替え" #define RETRO_LBL_GRAB_MOUSE_TOGGLE "マウスグラブを切り替え" #define RETRO_LBL_MENU_TOGGLE "メニューに切り替え" diff --git a/intl/msg_hash_jp.c b/intl/msg_hash_jp.c index b4497776c1..effa594f3f 100644 --- a/intl/msg_hash_jp.c +++ b/intl/msg_hash_jp.c @@ -4667,9 +4667,9 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y: return "Yボタン(左)"; case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT: - return "Select button"; + return "選択ボタン"; case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START: - return "Start button"; + return "スタートボタン"; case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP: return "上 (十字キー)"; case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN: @@ -4713,7 +4713,7 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE: return "ターボ有効"; case MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY: - return "早送りを切り替え"; + return "早送りに切り替え"; case MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY: return "ホールドで早送"; case MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY: @@ -4721,7 +4721,7 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY: return "状態保存"; case MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY: - return "フルスクリーンを切り替え"; + return "フルスクリーンに切り替え"; case MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY: return "RetroArchを終了"; case MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS: @@ -4769,13 +4769,25 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE: return "ディスクを取り出し"; case MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT: - return "次のディスクを切り替え"; + return "次のディスクに切り替え"; case MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV: - return "前のディスクを切り替え"; + return "前のディスクに切り替え"; case MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE: return "マウスグラブを切り替え"; case MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE: return "メニューに切り替え"; + case MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_INDEX: + return "デバイスインデックス"; + case MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE: + return "デバイスタイプ"; + case MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE: + return "アナログのデジタル化のタイプ"; + case MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL: + return "全てをバインド"; + case MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL: + return "全てのバインドを初期化"; + case MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG: + return "自動設定を保存"; default: #if 0 RARCH_LOG("Unimplemented: [%d]\n", msg); diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 8a13589f6b..d49eceeee2 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -4778,6 +4778,18 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Grab mouse toggle"; case MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE: return "Menu toggle"; + case MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_INDEX: + return "Device Index"; + case MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE: + return "Device Type"; + case MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE: + return "Analog To Digital Type"; + case MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL: + return "Bind All"; + case MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL: + return "Bind Default All"; + case MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG: + return "Save Autoconfig"; default: #if 0 RARCH_LOG("Unimplemented: [%d]\n", msg); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 7e6c781b0e..9c2fe54bec 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -1848,17 +1848,23 @@ static bool setting_append_list_input_player_options( sizeof(key_bind_defaults[user])); snprintf(label[user], sizeof(label[user]), - "%s %u Device Index", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1); + "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_INDEX)); snprintf(label_type[user], sizeof(label_type[user]), - "%s %u Device Type", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1); + "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE)); snprintf(label_analog[user], sizeof(label_analog[user]), - "%s %u Analog To Digital Type", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1); + "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE)); snprintf(label_bind_all[user], sizeof(label_bind_all[user]), - "%s %u Bind All", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1); + "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL)); snprintf(label_bind_defaults[user], sizeof(label_bind_defaults[user]), - "%s %u Bind Default All", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1); + "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL)); snprintf(label_bind_all_save_autoconfig[user], sizeof(label_bind_all_save_autoconfig[user]), - "%s %u Save Autoconfig", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1); + "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG)); CONFIG_UINT( list, list_info, diff --git a/msg_hash.h b/msg_hash.h index 734fb4b984..c96e52fac9 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -532,6 +532,13 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE, + MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_INDEX, + MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE, + MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE, + MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL, + MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL, + MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG, + MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS, MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE,