From 25353c31e3add362b0d94a3058cf44949a3759ad Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Fri, 23 Dec 2016 01:20:40 -0500 Subject: [PATCH] add new hash strings, update JP translation --- intl/msg_hash_ja.h | 20 +++++++++++++++++--- intl/msg_hash_us.h | 8 ++++++++ menu/cbs/menu_cbs_title.c | 26 +++++++++++++++++++++----- menu/menu_displaylist.c | 4 ++-- msg_hash.h | 6 ++++++ 5 files changed, 54 insertions(+), 10 deletions(-) diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index f44d14c5ee..954027dc96 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -991,10 +991,16 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_MODE, "ネットプレイのクライアントを有効") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME, "ユーザー名") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_PASSWORD, + "サーバのパスワード") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_SETTINGS, "ネットプレイ設定") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_STATELESS_MODE, + "ネットプレイのステートレスモード") +MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATE_PASSWORD, + "サーバの観覧パスワード") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATOR_MODE_ENABLE, - "ネットプレイの観覧者を有効") + "ネットプレイの観覧を有効") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_TCP_UDP_PORT, "ネットプレイのTCP/UDPポート") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_NAT_TRAVERSAL, @@ -1062,7 +1068,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS, "OSDオーバーレイ") MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_NOTIFICATIONS_SETTINGS, - "Onscreen Notifications") + "OSD通知") MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE, "フォルダでアーカイブを開く") MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL, @@ -1594,7 +1600,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_DIR, MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES, "シェーダーのパス数") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS, - "シェーダーのパラメータをプレビュー") + "シェーダーパラメータのプレビュー") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET, "シェーダーのプリセットをロード") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS, @@ -2340,3 +2346,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_USER_REMOTE_ENABLE, "ユーザー%dのリモートを有効") MSG_HASH(MENU_ENUM_LABEL_VALUE_BATTERY_LEVEL_ENABLE, "電池残量を表示") +MSG_HASH(MENU_ENUM_LABEL_VALUE_SELECT_FILE, + "ファイル選択") +MSG_HASH(MENU_ENUM_LABEL_VALUE_SELECT_FROM_COLLECTION, + "コレクションから選択") +MSG_HASH(MENU_ENUM_LABEL_VALUE_FILTER, + "フィルター") +MSG_HASH(MENU_ENUM_LABEL_VALUE_SCALE, + "スケール") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index d6f64669d2..7b56394972 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -2351,3 +2351,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_USER_REMOTE_ENABLE, "User %d Remote Enable") MSG_HASH(MENU_ENUM_LABEL_VALUE_BATTERY_LEVEL_ENABLE, "Display battery level") +MSG_HASH(MENU_ENUM_LABEL_VALUE_SELECT_FILE, + "Select File") +MSG_HASH(MENU_ENUM_LABEL_VALUE_SELECT_FROM_COLLECTION, + "Select From Collection") +MSG_HASH(MENU_ENUM_LABEL_VALUE_FILTER, + "Filter") +MSG_HASH(MENU_ENUM_LABEL_VALUE_SCALE, + "Scale") diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 83736870f4..89710e9c5c 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -172,9 +172,14 @@ default_fill_title_macro(action_get_title_assets_directory, MENU_ENUM_LABE default_fill_title_macro(action_get_title_extraction_directory, MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY) default_fill_title_macro(action_get_title_menu, MENU_ENUM_LABEL_VALUE_MENU_SETTINGS) default_fill_title_macro(action_get_title_font_path, MENU_ENUM_LABEL_VALUE_XMB_FONT) +default_fill_title_macro(action_get_title_collection, MENU_ENUM_LABEL_VALUE_SELECT_FROM_COLLECTION) default_title_copy_macro(action_get_title_help, MENU_ENUM_LABEL_VALUE_HELP_LIST) default_title_copy_macro(action_get_title_input_settings, MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS) +default_title_copy_macro(action_get_title_cheevos_list, MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST) +default_title_copy_macro(action_get_title_cheevos_list_hardcore, MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST_HARDCORE) +default_title_copy_macro(action_get_title_video_shader_parameters,MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS) +default_title_copy_macro(action_get_title_video_shader_preset_parameters,MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS) static int action_get_title_generic(char *s, size_t len, const char *path, const char *text) @@ -229,7 +234,7 @@ default_title_generic_macro(action_get_title_list_rdb_entry_database_info,MENU_E static int action_get_title_default(const char *path, const char *label, unsigned menu_type, char *s, size_t len) { - snprintf(s, len, "%s %s", "Select File", path); + snprintf(s, len, "%s %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SELECT_FILE), path); return 0; } @@ -982,11 +987,22 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_playlist_settings_list); break; - case MENU_LABEL_MANAGEMENT: - case MENU_LABEL_ACHIEVEMENT_LIST: - case MENU_LABEL_VIDEO_SHADER_PARAMETERS: - case MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS: case MENU_LABEL_CONTENT_COLLECTION_LIST: + BIND_ACTION_GET_TITLE(cbs, action_get_title_collection); + break; + case MENU_LABEL_ACHIEVEMENT_LIST: + BIND_ACTION_GET_TITLE(cbs, action_get_title_cheevos_list); + break; + case MENU_LABEL_ACHIEVEMENT_LIST_HARDCORE: + BIND_ACTION_GET_TITLE(cbs, action_get_title_cheevos_list_hardcore); + break; + case MENU_LABEL_VIDEO_SHADER_PARAMETERS: + BIND_ACTION_GET_TITLE(cbs, action_get_title_video_shader_parameters); + break; + case MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS: + BIND_ACTION_GET_TITLE(cbs, action_get_title_video_shader_preset_parameters); + break; + case MENU_LABEL_MANAGEMENT: BIND_ACTION_GET_TITLE(cbs, action_get_title_action_generic); break; case MENU_LABEL_DISK_IMAGE_APPEND: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index c5c88b627b..51ec58fcd9 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1559,13 +1559,13 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info) MENU_ENUM_LABEL_VIDEO_SHADER_PASS, MENU_SETTINGS_SHADER_PASS_0 + i, 0, 0); - snprintf(buf, sizeof(buf), "%s Filter", buf_tmp); + snprintf(buf, sizeof(buf), "%s %s", buf_tmp, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FILTER)); menu_entries_append_enum(info->list, buf, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS), MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS, MENU_SETTINGS_SHADER_PASS_FILTER_0 + i, 0, 0); - snprintf(buf, sizeof(buf), "%s Scale", buf_tmp); + snprintf(buf, sizeof(buf), "%s %s", buf_tmp, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCALE)); menu_entries_append_enum(info->list, buf, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_SCALE_PASS), MENU_ENUM_LABEL_VIDEO_SHADER_SCALE_PASS, diff --git a/msg_hash.h b/msg_hash.h index 6216b738fa..60607f1014 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1533,6 +1533,12 @@ enum msg_hash_enums MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST, MENU_ENUM_SUBLABEL_SERVICES_SETTINGS, + MENU_LABEL(SELECT_FILE), + MENU_LABEL(SELECT_FROM_COLLECTION), + + MENU_ENUM_LABEL_VALUE_FILTER, + MENU_ENUM_LABEL_VALUE_SCALE, + MSG_LAST };