diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross
index 875c32fd39..5c24d99ff2 160000
--- a/deps/SPIRV-Cross
+++ b/deps/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit 875c32fd39a06f624814effe5eab691b078429f5
+Subproject commit 5c24d99ff22a25ef38e9e39985f80cf57a1e7418
diff --git a/deps/glslang/glslang b/deps/glslang/glslang
index be8462149a..a4a4d5e22c 160000
--- a/deps/glslang/glslang
+++ b/deps/glslang/glslang
@@ -1 +1 @@
-Subproject commit be8462149a3c150fc89db84e57ef06de3ab90d47
+Subproject commit a4a4d5e22c375d37bd286106904ef819eafff29b
diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index b8f0b6044c..39b490c160 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -229,7 +229,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE,
-      "Load Shader Presets Automatically"
+      "シェーダーのプリセットを自動的にロード"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK,
@@ -261,7 +261,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD,
-      "Toggle Keyboard" "キーボードに切り替え"
+      "キーボードに切り替え"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU,
@@ -269,7 +269,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS,
-      "Basic menu controls"
+      "基本的なメニューコントルール"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_CONFIRM,
@@ -285,7 +285,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_SCROLL_UP,
-      "Scroll Up"
+      "上にスクロール"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_START,
@@ -647,7 +647,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS,
       "入力のホットキーバインド")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ICADE_ENABLE,
-      "Keyboard Gamepad Mapping Enable")
+      "キーボードのゲームパッドマッピングを有効")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,
       "Aボタン(右)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,
@@ -775,7 +775,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS,
       "入力")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE,
-      "Small Keyboard Enable")
+      "小さいキーボードを有効")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_TOUCH_ENABLE,
       "タッチを有効")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,
@@ -943,7 +943,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_INFORMATION,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE,
       "ネットワークゲームパッド")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_PORT,
-      "Network Remote Base Port")
+      "ネットワークリモートのベースポート")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS,
       "ネットワーク")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO,
@@ -1568,6 +1568,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC,
       "VSYNC")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN,
       "ウィンドウのフルスクリーンモード")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_WIDTH,
+      "ウィンドウの幅")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_HEIGHT,
+      "ウィンドウの縦")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_DRIVER,
       "Wi-Fiのドライバ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS,
@@ -2214,7 +2218,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_ENABLED,
-   "Enabled"
+   "有効"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_PATH,
@@ -2264,8 +2268,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE,
 MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE,
       "Limit the number of entries in recent playlist for games, images, music, and videos.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS,
-      "Unified Menu Controls")
+      "統一的なメニューコントロール")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS,
       "Use the same controls for both the menu and the game. Applies to the keyboard.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FONT_ENABLE,
-      "Show onscreen messages.")
+      "OSDメッセージを表する。")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_USER_REMOTE_ENABLE,
+      "ユーザー%dのリモートを有効")
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 89b807f043..f2d2835b88 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -2281,3 +2281,5 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS,
       "Use the same controls for both the menu and the game. Applies to the keyboard.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FONT_ENABLE,
       "Show onscreen messages.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_USER_REMOTE_ENABLE,
+      "User %d Remote Enable")
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 0b2f67067f..dabcb811c1 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -5731,7 +5731,7 @@ static bool setting_append_list(
                char s1[64], s2[64];
 
                snprintf(s1, sizeof(s1), "%s_user_p%d", msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_REMOTE_ENABLE), user + 1);
-               snprintf(s2, sizeof(s2), "User %d Remote Enable", user + 1);
+               snprintf(s2, sizeof(s2), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETWORK_USER_REMOTE_ENABLE), user + 1);
 
 
                CONFIG_BOOL_ALT(
diff --git a/msg_hash.h b/msg_hash.h
index bc1a0af2a0..0ca9835b8a 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1167,6 +1167,8 @@ enum msg_hash_enums
 
    MENU_ENUM_LABEL_NETWORK_REMOTE_USER_LAST_ENABLE = MENU_ENUM_LABEL_NETWORK_REMOTE_USER_1_ENABLE + MAX_USERS,
 
+   MENU_LABEL(NETWORK_USER_REMOTE_ENABLE),
+
    MENU_LABEL(DUMMY_ON_CORE_SHUTDOWN),
    MENU_LABEL(CHECK_FOR_MISSING_FIRMWARE),