Merge pull request #4037 from lasers/sort-sublabels

Organize Label, Value, Sublabel

msg_hash.h

@@ -415,11 +415,12 @@ enum msg_hash_enums
 
    /* System information */
 
-   MENU_ENUM_LABEL_CPU_ARCHITECTURE,
    MENU_ENUM_LABEL_CPU_CORES,
-
-   MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE,
    MENU_ENUM_LABEL_VALUE_CPU_CORES,
+   MENU_ENUM_SUBLABEL_CPU_CORES,
+
+   MENU_ENUM_LABEL_CPU_ARCHITECTURE,
+   MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE,
 
    /* Input  */
 
@@ -427,13 +428,14 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE_LAST = MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE + MAX_USERS,
    MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE,
    MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE_LAST = MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE + MAX_USERS,
-   MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS_BEGIN,
    MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
-   MENU_ENUM_LABEL_INPUT_SETTINGS,
    MENU_ENUM_LABEL_INPUT_SETTINGS_BEGIN,
    MENU_ENUM_LABEL_INPUT_OVERLAY_HIDE_IN_MENU,
-   MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
+
    MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS,
+   MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS_BEGIN,
+   MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS,
+
    MENU_ENUM_LABEL_INPUT_OSK_OVERLAY_ENABLE,
    MENU_ENUM_LABEL_INPUT_OVERLAY_ENABLE,
    MENU_ENUM_LABEL_INPUT_PLAYER1_JOYPAD_INDEX,
@@ -555,6 +557,8 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS,
 
    MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS,
+   MENU_ENUM_SUBLABEL_INPUT_USER_BINDS,
+
    MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE,
    MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE,
    MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW,
@@ -568,7 +572,11 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
    MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE,
    MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS,
+
+   MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
    MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
+   MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
+
    MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
    MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
    MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE,
@@ -593,18 +601,32 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VIDEO_FILTER_FLICKER,
    MENU_ENUM_LABEL_VIDEO_SOFT_FILTER,
    MENU_ENUM_LABEL_VIDEO_SWAP_INTERVAL,
+
+   MENU_ENUM_LABEL_VALUE_VIDEO_MAX_SWAPCHAIN_IMAGES,
    MENU_ENUM_LABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
+   MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
+
    MENU_ENUM_LABEL_VIDEO_GPU_SCREENSHOT,
    MENU_ENUM_LABEL_VIDEO_FULLSCREEN,
+
+   MENU_ENUM_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION,
    MENU_ENUM_LABEL_VIDEO_BLACK_FRAME_INSERTION,
-   MENU_ENUM_LABEL_VIDEO_HARD_SYNC_FRAMES,
+   MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION,
+
+   MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_DELAY,
    MENU_ENUM_LABEL_VIDEO_FRAME_DELAY,
-   MENU_ENUM_LABEL_VIDEO_THREADED,
+   MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY,
+
    MENU_ENUM_LABEL_VIDEO_VSYNC,
+
+   MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC,
    MENU_ENUM_LABEL_VIDEO_HARD_SYNC,
-   MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX,
+   MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC,
-   MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_AUTO,
+
-   MENU_ENUM_LABEL_VIDEO_REFRESH_RATE,
+   MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES,
+   MENU_ENUM_LABEL_VIDEO_HARD_SYNC_FRAMES,
+   MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC_FRAMES,
+
    MENU_ENUM_LABEL_VIDEO_WINDOWED_FULLSCREEN,
    MENU_ENUM_LABEL_VIDEO_FORCE_SRGB_DISABLE,
    MENU_ENUM_LABEL_VIDEO_ROTATION,
@@ -623,8 +645,11 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT,
    MENU_ENUM_SUBLABEL_VIDEO_SHARED_CONTEXT,
 
+   MENU_ENUM_LABEL_VALUE_VIDEO_THREADED,
+   MENU_ENUM_LABEL_VIDEO_THREADED,
+   MENU_ENUM_SUBLABEL_VIDEO_THREADED,
+
    MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH,
-   MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS,
    MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
    MENU_ENUM_LABEL_VALUE_VIDEO_FONT_ENABLE,
    MENU_ENUM_LABEL_VALUE_VIDEO_FONT_PATH,
@@ -633,15 +658,9 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y,
    MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER,
    MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER,
-   MENU_ENUM_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION,
-   MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES,
-   MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_DELAY,
    MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION,
-   MENU_ENUM_LABEL_VALUE_VIDEO_THREADED,
    MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC,
-   MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC,
    MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL,
-   MENU_ENUM_LABEL_VALUE_VIDEO_MAX_SWAPCHAIN_IMAGES,
    MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT,
    MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN,
    MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_ASPECT,
@@ -651,15 +670,25 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD,
    MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA,
    MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE,
+
    MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX,
-   MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE,
+   MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX,
+   MENU_ENUM_SUBLABEL_VIDEO_MONITOR_INDEX,
+
    MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN,
    MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE,
    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE,
    MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH,
    MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER,
+
+   MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE,
+   MENU_ENUM_LABEL_VIDEO_REFRESH_RATE,
+
    MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO,
+   MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_AUTO,
+   MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_AUTO,
+
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X,
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
@@ -675,8 +704,8 @@ enum msg_hash_enums
 
    MENU_ENUM_LABEL_RUN,
 
-
    /* Menu settings */
+
    MENU_ENUM_LABEL_MENU_WALLPAPER,
    MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER,
 
@@ -815,6 +844,7 @@ enum msg_hash_enums
 
    MENU_ENUM_LABEL_MENU_SETTINGS,
    MENU_ENUM_LABEL_VALUE_MENU_SETTINGS,
+   MENU_ENUM_SUBLABEL_MENU_SETTINGS,
 
    MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST,
    MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST,
@@ -824,11 +854,17 @@ enum msg_hash_enums
    MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS,
 
    MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS,
+
    MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS,
    MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS,
+   MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS,
+
    MENU_ENUM_LABEL_UPDATER_SETTINGS,
    MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS,
+
+   MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS,
    MENU_ENUM_LABEL_WIFI_SETTINGS,
+   MENU_ENUM_SUBLABEL_WIFI_SETTINGS,
 
    MENU_ENUM_LABEL_USER_SETTINGS,
    MENU_ENUM_LABEL_VALUE_USER_SETTINGS,
@@ -857,7 +893,6 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_STATE_SLOT,
    MENU_ENUM_LABEL_VALUE_STATE_SLOT,
 
-
    MENU_ENUM_LABEL_PLAYLIST_SETTINGS_BEGIN,
 
    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYNAMIC_SUPPORT,
@@ -875,6 +910,7 @@ enum msg_hash_enums
 
    MENU_ENUM_LABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
    MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE,
+   MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
 
    MENU_ENUM_LABEL_CHEEVOS_TEST_UNOFFICIAL,
    MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL,
@@ -913,7 +949,6 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_HELP_CONTROLS,
    MENU_ENUM_LABEL_HELP_CONTROLS,
 
-
    MENU_ENUM_LABEL_VALUE_EXTRACTING_PLEASE_WAIT,
 
    MENU_ENUM_LABEL_WELCOME_TO_RETROARCH,
@@ -1004,6 +1039,7 @@ enum msg_hash_enums
 
    MENU_ENUM_LABEL_ADD_CONTENT_LIST,
    MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST,
+   MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
 
    MENU_ENUM_LABEL_CONFIGURATIONS_LIST,
    MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST,
@@ -1075,9 +1111,8 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_CORE_ENABLE,
    MENU_ENUM_LABEL_VALUE_CORE_ENABLE,
 
-
-
    /* Netplay */
+
    MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST,
    MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
    MENU_ENUM_LABEL_NETPLAY_ENABLE_CLIENT,
@@ -1087,8 +1122,6 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_NETPLAY_SETTINGS,
    MENU_ENUM_LABEL_VALUE_NETPLAY_SETTINGS,
 
-
-
    MENU_ENUM_LABEL_COLLAPSE_SUBGROUPS_ENABLE,
    MENU_ENUM_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE,
 
@@ -1158,12 +1191,12 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_AUDIO_SYNC,
 
    MENU_ENUM_LABEL_AUDIO_VOLUME,
-   MENU_ENUM_SUBLABEL_AUDIO_VOLUME,
    MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME,
+   MENU_ENUM_SUBLABEL_AUDIO_VOLUME,
 
    MENU_ENUM_LABEL_AUDIO_RATE_CONTROL_DELTA,
-   MENU_ENUM_SUBLABEL_AUDIO_RATE_CONTROL_DELTA,
    MENU_ENUM_LABEL_VALUE_AUDIO_RATE_CONTROL_DELTA,
+   MENU_ENUM_SUBLABEL_AUDIO_RATE_CONTROL_DELTA,
 
    MENU_ENUM_LABEL_AUDIO_LATENCY,
    MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY,
@@ -1185,8 +1218,11 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_SHADER_NEXT,
    MENU_ENUM_LABEL_SHADER_PREV,
    MENU_ENUM_LABEL_FRAME_ADVANCE,
+
    MENU_ENUM_LABEL_FPS_SHOW,
    MENU_ENUM_LABEL_VALUE_FPS_SHOW,
+   MENU_ENUM_SUBLABEL_FPS_SHOW,
+
    MENU_ENUM_LABEL_MOVIE_RECORD_TOGGLE,
    MENU_ENUM_LABEL_L_X_PLUS,
    MENU_ENUM_LABEL_L_X_MINUS,
@@ -1230,8 +1266,11 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE,
    MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD,
    MENU_ENUM_LABEL_SYSTEM_DIRECTORY,
+
    MENU_ENUM_LABEL_SUSPEND_SCREENSAVER_ENABLE,
    MENU_ENUM_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE,
+   MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
+
    MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE,
    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
    MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE,
@@ -1239,17 +1278,27 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_XMB_SCALE_FACTOR,
    MENU_ENUM_LABEL_VOLUME_UP,
    MENU_ENUM_LABEL_VOLUME_DOWN,
+
    MENU_ENUM_LABEL_LOG_VERBOSITY,
    MENU_ENUM_LABEL_VALUE_LOG_VERBOSITY,
+   MENU_ENUM_SUBLABEL_LOG_VERBOSITY,
+
    MENU_ENUM_LABEL_OVERLAY_NEXT,
    MENU_ENUM_LABEL_NETPLAY_ENABLE,
    MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE,
+
    MENU_ENUM_LABEL_SSH_ENABLE,
    MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
+   MENU_ENUM_SUBLABEL_SSH_ENABLE,
+
    MENU_ENUM_LABEL_SAMBA_ENABLE,
    MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
+   MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
+
    MENU_ENUM_LABEL_BLUETOOTH_ENABLE,
    MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
+   MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
+
    MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT,
    MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT,
    MENU_ENUM_LABEL_NETPLAY_DELAY_FRAMES,
@@ -1299,17 +1348,19 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_LIBRETRO_LOG_LEVEL,
    MENU_ENUM_LABEL_VALUE_LIBRETRO_LOG_LEVEL,
 
-
    MENU_ENUM_LABEL_AUTOSAVE_INTERVAL,
    MENU_ENUM_LABEL_VALUE_AUTOSAVE_INTERVAL,
+
    MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT,
    MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT,
+   MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
 
    MENU_ENUM_LABEL_CONFIRM_ON_EXIT,
    MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT,
 
    MENU_ENUM_LABEL_SHOW_HIDDEN_FILES,
    MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES,
+   MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
 
    /* Driver settings */
 
@@ -1366,15 +1417,15 @@ enum msg_hash_enums
    /* Privacy settings */
 
    MENU_ENUM_LABEL_CAMERA_ALLOW,
-   MENU_ENUM_SUBLABEL_CAMERA_ALLOW,
    MENU_ENUM_LABEL_VALUE_CAMERA_ALLOW,
+   MENU_ENUM_SUBLABEL_CAMERA_ALLOW,
 
    MENU_ENUM_LABEL_LOCATION_ALLOW,
-   MENU_ENUM_SUBLABEL_LOCATION_ALLOW,
    MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW,
-
+   MENU_ENUM_SUBLABEL_LOCATION_ALLOW,
 
    /* RDB Settings */
+
    MENU_ENUM_LABEL_RDB_ENTRY_ANALOG,
    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG,
    MENU_ENUM_LABEL_RDB_ENTRY_SERIAL,
@@ -1484,7 +1535,11 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_MAIN_MENU,
    MENU_ENUM_LABEL_VALUE_MAIN_MENU,
    MENU_ENUM_LABEL_VALUE_SETTINGS,
+
+   MENU_ENUM_LABEL_INPUT_SETTINGS,
    MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS,
+   MENU_ENUM_SUBLABEL_INPUT_SETTINGS,
+
    MENU_ENUM_LABEL_VALUE_ON,
    MENU_ENUM_LABEL_VALUE_OFF,
    MENU_ENUM_LABEL_VALUE_TRUE,
@@ -1518,8 +1573,6 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_SYSTEM_BGM_ENABLE,
    MENU_ENUM_LABEL_VALUE_SYSTEM_BGM_ENABLE,
 
-
-
    MENU_ENUM_LABEL_NETWORK_CMD_ENABLE,
    MENU_ENUM_LABEL_VALUE_NETWORK_CMD_ENABLE,
    MENU_ENUM_LABEL_NETWORK_CMD_PORT,
@@ -1569,10 +1622,15 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_MANAGEMENT,
    MENU_ENUM_LABEL_ONLINE,
    MENU_ENUM_LABEL_VALUE_ONLINE,
+
    MENU_ENUM_LABEL_ONLINE_UPDATER,
    MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER,
+   MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
+
    MENU_ENUM_LABEL_NETPLAY,
    MENU_ENUM_LABEL_VALUE_NETPLAY,
+   MENU_ENUM_SUBLABEL_NETPLAY,
+
    MENU_ENUM_LABEL_SETTINGS,
    MENU_ENUM_LABEL_FRONTEND_COUNTERS,
    MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS,
@@ -1680,15 +1738,19 @@ enum msg_hash_enums
 
    MENU_ENUM_LABEL_DRIVER_SETTINGS,
    MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
+   MENU_ENUM_SUBLABEL_DRIVER_SETTINGS,
 
-
+   MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS,
    MENU_ENUM_LABEL_VIDEO_SETTINGS,
+   MENU_ENUM_SUBLABEL_VIDEO_SETTINGS,
 
    MENU_ENUM_LABEL_AUDIO_SETTINGS,
    MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS,
+   MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
 
    MENU_ENUM_LABEL_CORE_SETTINGS,
    MENU_ENUM_LABEL_VALUE_CORE_SETTINGS,
+   MENU_ENUM_SUBLABEL_CORE_SETTINGS,
 
    MENU_ENUM_LABEL_CONFIGURATION_SETTINGS,
    MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS,
@@ -1706,6 +1768,8 @@ enum msg_hash_enums
 
    MENU_ENUM_LABEL_RECORDING_SETTINGS,
    MENU_ENUM_LABEL_VALUE_RECORDING_SETTINGS,
+   MENU_ENUM_SUBLABEL_RECORDING_SETTINGS,
+
    MENU_ENUM_LABEL_SHADER_SETTINGS,
    MENU_ENUM_LABEL_FONT_SETTINGS,
    MENU_ENUM_LABEL_OVERLAY_SETTINGS,
@@ -1723,7 +1787,6 @@ enum msg_hash_enums
 
    MENU_ENUM_LABEL_CORE_UPDATER_SETTINGS,
    MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS,
-   MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS,
    MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
    MENU_ENUM_LABEL_LAKKA_SERVICES,
    MENU_ENUM_LABEL_ARCHIVE_SETTINGS,
@@ -1739,56 +1802,55 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS,
    MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS,
 
-   MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES,
    MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES,
+   MENU_ENUM_LABEL_CHEAT_FILE_SAVE_AS,
+   MENU_ENUM_LABEL_COLLECTION,
+   MENU_ENUM_LABEL_CONFIGURATIONS,
+   MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST,
    MENU_ENUM_LABEL_CUSTOM_BIND,
    MENU_ENUM_LABEL_CUSTOM_BIND_ALL,
    MENU_ENUM_LABEL_CUSTOM_BIND_DEFAULTS,
-   MENU_ENUM_LABEL_RESUME_CONTENT,
+   MENU_ENUM_LABEL_DELETE_ENTRY,
-   MENU_ENUM_LABEL_VALUE_RESUME_CONTENT,
+   MENU_ENUM_LABEL_EXIT_EMULATOR,
-   MENU_ENUM_LABEL_VALUE_RESUME,
+   MENU_ENUM_LABEL_OSK_ENABLE,
+   MENU_ENUM_LABEL_REMAP_FILE_SAVE_CORE,
+   MENU_ENUM_LABEL_REMAP_FILE_SAVE_GAME,
    MENU_ENUM_LABEL_RESTART_CONTENT,
    MENU_ENUM_LABEL_RESTART_RETROARCH,
-   MENU_ENUM_LABEL_VALUE_RESTART_RETROARCH,
+   MENU_ENUM_LABEL_RESUME_CONTENT,
-   MENU_ENUM_LABEL_VALUE_RESTART_CONTENT,
    MENU_ENUM_LABEL_TAKE_SCREENSHOT,
-   MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT,
+   MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES,
-   MENU_ENUM_LABEL_DELETE_ENTRY,
-   MENU_ENUM_LABEL_VALUE_DELETE_ENTRY,
-   MENU_ENUM_LABEL_CONFIGURATIONS,
-   MENU_ENUM_LABEL_VALUE_CONFIGURATIONS,
    MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS,
-   MENU_ENUM_LABEL_CHEAT_FILE_SAVE_AS,
+   MENU_ENUM_LABEL_VALUE_CONFIGURATIONS,
-   MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS,
+   MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST,
-   MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE,
+   MENU_ENUM_LABEL_VALUE_DELETE_ENTRY,
-   MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME,
+   MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_CORE,
+   MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_GAME,
+   MENU_ENUM_LABEL_VALUE_RESTART_CONTENT,
+   MENU_ENUM_LABEL_VALUE_RESTART_RETROARCH,
+   MENU_ENUM_LABEL_VALUE_RESUME,
+   MENU_ENUM_LABEL_VALUE_RESUME_CONTENT,
+   MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT,
+   MENU_ENUM_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE,
    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS,
    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_CORE,
    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME,
-   MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_CORE,
+   MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS,
-   MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_GAME,
+   MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE,
-   MENU_ENUM_LABEL_REMAP_FILE_SAVE_CORE,
+   MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME,
-   MENU_ENUM_LABEL_REMAP_FILE_SAVE_GAME,
+
-   MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST,
-   MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST,
-   MENU_ENUM_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE,
-   MENU_ENUM_LABEL_OSK_ENABLE,
-   MENU_ENUM_LABEL_EXIT_EMULATOR,
-   MENU_ENUM_LABEL_COLLECTION,
    MENU_ENUM_LABEL_USER_LANGUAGE,
    MENU_ENUM_LABEL_VALUE_USER_LANGUAGE,
+   MENU_ENUM_SUBLABEL_USER_LANGUAGE,
+
    MENU_ENUM_LABEL_NETPLAY_NICKNAME,
    MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME,
+
    MENU_ENUM_LABEL_VIDEO_VI_WIDTH,
-
    MENU_ENUM_LABEL_VIDEO_FORCE_ASPECT,
-
    MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_AUTO,
-
    MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX,
-
    MENU_ENUM_LABEL_VIDEO_VFILTER,
-
    MENU_ENUM_LABEL_VIDEO_GPU_RECORD,
 
    MENU_ENUM_LABEL_RECORD_USE_OUTPUT_DIRECTORY,
@@ -1890,13 +1952,13 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_V4L2_SUPPORT,
    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
 
-   MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIR,
    MENU_ENUM_LABEL_VALUE_CONTENT_DIR,
+   MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIR,
 
    MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION,
 
-   MENU_ENUM_LABEL_VALUE_YES,
    MENU_ENUM_LABEL_VALUE_NO,
+   MENU_ENUM_LABEL_VALUE_YES,
 
    MENU_ENUM_LABEL_VALUE_DISABLED,
    MENU_ENUM_LABEL_VALUE_PORT,
@@ -1921,23 +1983,20 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_LANG_VIETNAMESE,
 
    MENU_ENUM_LABEL_VALUE_NONE,
-
    MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE,
 
-
    MENU_ENUM_LABEL_USE_BUILTIN_IMAGE_VIEWER,
    MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER,
 
    MENU_ENUM_LABEL_OVERLAY_AUTOLOAD_PREFERRED,
    MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED,
 
-   MENU_ENUM_LABEL_OPEN_ARCHIVE,
-   MENU_ENUM_LABEL_OPEN_ARCHIVE_DETECT_CORE,
-   MENU_ENUM_LABEL_LOAD_ARCHIVE_DETECT_CORE,
    MENU_ENUM_LABEL_LOAD_ARCHIVE,
-
+   MENU_ENUM_LABEL_OPEN_ARCHIVE,
-   MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
+   MENU_ENUM_LABEL_LOAD_ARCHIVE_DETECT_CORE,
+   MENU_ENUM_LABEL_OPEN_ARCHIVE_DETECT_CORE,
    MENU_ENUM_LABEL_VALUE_LOAD_ARCHIVE,
+   MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
 
    MENU_ENUM_LABEL_VALUE_WHAT_IS_A_CORE_DESC,
 
@@ -1960,9 +2019,9 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
    MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME,
 
+   MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_BOXARTS,
    MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_SCREENSHOTS,
    MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_TITLE_SCREENS,
-   MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_BOXARTS,
 
    /* Callback strings */
    MENU_ENUM_LABEL_CB_CORE_CONTENT_DIRS_LIST,
@@ -1989,42 +2048,8 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_CB_UPDATE_SHADERS_SLANG,
 
    /* Sublabels */
-   MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
-   MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
-   MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
-   MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
-   MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
-   MENU_ENUM_SUBLABEL_CORE_SETTINGS,
-   MENU_ENUM_SUBLABEL_CPU_CORES,
-   MENU_ENUM_SUBLABEL_DRIVER_SETTINGS,
-   MENU_ENUM_SUBLABEL_FPS_SHOW,
    MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
-   MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS,
+   MENU_ENUM_SUBLABEL_SERVICES_SETTINGS
-   MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
-   MENU_ENUM_SUBLABEL_INPUT_SETTINGS,
-   MENU_ENUM_SUBLABEL_INPUT_USER_BINDS,
-   MENU_ENUM_SUBLABEL_LOG_VERBOSITY,
-   MENU_ENUM_SUBLABEL_MENU_SETTINGS,
-   MENU_ENUM_SUBLABEL_NETPLAY,
-   MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
-   MENU_ENUM_SUBLABEL_RECORDING_SETTINGS,
-   MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS,
-   MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
-   MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
-   MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
-   MENU_ENUM_SUBLABEL_SSH_ENABLE,
-   MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
-   MENU_ENUM_SUBLABEL_USER_LANGUAGE,
-   MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION,
-   MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY,
-   MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC,
-   MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC_FRAMES,
-   MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
-   MENU_ENUM_SUBLABEL_VIDEO_MONITOR_INDEX,
-   MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_AUTO,
-   MENU_ENUM_SUBLABEL_VIDEO_SETTINGS,
-   MENU_ENUM_SUBLABEL_VIDEO_THREADED,
-   MENU_ENUM_SUBLABEL_WIFI_SETTINGS
 };