diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross index 5c24d99ff2..cc207e32c8 160000 --- a/deps/SPIRV-Cross +++ b/deps/SPIRV-Cross @@ -1 +1 @@ -Subproject commit 5c24d99ff22a25ef38e9e39985f80cf57a1e7418 +Subproject commit cc207e32c8668bfe5a5cc514394e7df8f020ecf6 diff --git a/deps/glslang/glslang b/deps/glslang/glslang index a4a4d5e22c..b56f4ac72c 160000 --- a/deps/glslang/glslang +++ b/deps/glslang/glslang @@ -1 +1 @@ -Subproject commit a4a4d5e22c375d37bd286106904ef819eafff29b +Subproject commit b56f4ac72c57f5c50f14ddb0bf1f78eaaef21c2b diff --git a/media/rarch.rc b/media/rarch.rc index bfd77f4021..50bd49602e 100644 --- a/media/rarch.rc +++ b/media/rarch.rc @@ -4,13 +4,9 @@ #include "../ui/drivers/ui_win32_resource.h" #include - - - -// // Menu resources // -LANGUAGE 0, SUBLANG_NEUTRAL +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDR_MENU MENU { POPUP "File" @@ -82,7 +78,7 @@ IDR_MENU MENU // // Dialog resources // -LANGUAGE 0, SUBLANG_NEUTRAL +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_PICKCORE DIALOG 0, 0, 225, 118 STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU CAPTION "Pick Core" @@ -99,7 +95,7 @@ FONT 8, "Ms Shell Dlg" // // Icon resources // -LANGUAGE 0, SUBLANG_NEUTRAL +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 ICON "icon_light.ico" @@ -107,5 +103,7 @@ LANGUAGE 0, SUBLANG_NEUTRAL // // Manifest resources // -LANGUAGE 0, SUBLANG_NEUTRAL +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 2 RT_MANIFEST "rarch.manifest" + +#include "rarch_ja.rc" diff --git a/media/rarch_ja.rc b/media/rarch_ja.rc new file mode 100644 index 0000000000..79e76551be --- /dev/null +++ b/media/rarch_ja.rc @@ -0,0 +1,87 @@ +// Menu resources (Japanese) +// +// The encoding for this file is CP932. + +LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +IDR_MENU MENU +{ + POPUP "ファイル" + { + MENUITEM "コアをロード", ID_M_LOAD_CORE + MENUITEM "コンテンツをロード", ID_M_LOAD_CONTENT + MENUITEM SEPARATOR + MENUITEM "終了", ID_M_QUIT + } + POPUP "コマンド" + { + POPUP "オーディオ設定" + { + MENUITEM "オーディオを消音", ID_M_MUTE_TOGGLE + } + POPUP "ディスク操作" + { + MENUITEM "ディスク取り出し", ID_M_DISK_CYCLE + MENUITEM "前のディスク", ID_M_DISK_PREV + MENUITEM "次のディスク", ID_M_DISK_NEXT + } + POPUP "保存状態設定" + { + POPUP "状態のインデックス" + { + MENUITEM "-1 (自動)", ID_M_STATE_INDEX_AUTO + MENUITEM "0", ID_M_STATE_INDEX_AUTO + MENUITEM "1", ID_M_STATE_INDEX_AUTO + MENUITEM "2", ID_M_STATE_INDEX_AUTO + MENUITEM "3", ID_M_STATE_INDEX_AUTO + MENUITEM "4", ID_M_STATE_INDEX_AUTO + MENUITEM "5", ID_M_STATE_INDEX_AUTO + MENUITEM "6", ID_M_STATE_INDEX_AUTO + MENUITEM "7", ID_M_STATE_INDEX_AUTO + MENUITEM "8", ID_M_STATE_INDEX_AUTO + MENUITEM "9", ID_M_STATE_INDEX_AUTO + } + MENUITEM "保存状態をロード", ID_M_LOAD_STATE + MENUITEM "状態保存", ID_M_SAVE_STATE + } + MENUITEM "リセット", ID_M_RESET + MENUITEM "メニューに切り替え", ID_M_MENU_TOGGLE + MENUITEM "一時停止", ID_M_PAUSE_TOGGLE + MENUITEM "マウスグラブ切り替え", ID_M_MOUSE_GRAB + MENUITEM "スクリーンショットを撮る", ID_M_TAKE_SCREENSHOT + } + POPUP "ウィンドウ" + { + POPUP "ウィンドウのスケール" + { + MENUITEM "1x", ID_M_WINDOW_SCALE_1X + MENUITEM "2x", ID_M_WINDOW_SCALE_2X + MENUITEM "3x", ID_M_WINDOW_SCALE_3X + MENUITEM "4x", ID_M_WINDOW_SCALE_4X + MENUITEM "5x", ID_M_WINDOW_SCALE_5X + MENUITEM "6x", ID_M_WINDOW_SCALE_6X + MENUITEM "7x", ID_M_WINDOW_SCALE_7X + MENUITEM "8x", ID_M_WINDOW_SCALE_8X + MENUITEM "9x", ID_M_WINDOW_SCALE_9X + MENUITEM "10x", ID_M_WINDOW_SCALE_10X + } + MENUITEM "排他的なフルスクリーン切り替え", ID_M_FULL_SCREEN + MENUITEM "シェーダーのパラメータ", ID_M_SHADER_PARAMETERS + } +} + + + +// +// Dialog resources +// +LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +IDD_PICKCORE DIALOG 0, 0, 225, 118 +STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU +CAPTION "コア選択" +FONT 8, "Ms Shell Dlg" +{ + PUSHBUTTON "キャンセル", IDCANCEL, 170, 32, 50, 14, 0, WS_EX_LEFT + DEFPUSHBUTTON "OK", IDOK, 170, 15, 50, 14, 0, WS_EX_LEFT + LISTBOX ID_CORELISTBOX, 5, 55, 214, 60, WS_TABSTOP | WS_VSCROLL | LBS_NOINTEGRALHEIGHT | LBS_SORT | LBS_NOTIFY, WS_EX_LEFT + LTEXT "コンテンツに使用するコアを選択してください。", 0, 9, 12, 160, 17, SS_LEFT, WS_EX_LEFT +}