diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index 693a21c3f6..744e4f5aba 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -3004,96 +3004,6 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
    switch (msg)
    {
       #include "msg_hash_us.h"
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS:
-         return "Locked Achievements:";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ENTRY:
-         return "Locked";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS:
-         return "Retro Achievements";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL:
-         return "Test unofficial";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS:
-         return "Unlocked Achievements:";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY:
-         return "Unlocked";
-      case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT:
-         return "Close";
-      case MENU_ENUM_LABEL_VALUE_CONFIG:
-         return "Config";
-      case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS:
-         return "Load Configuration";
-      case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
-         return "Configuration";
-      case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
-         return "Save Configuration On Exit";
-      case MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT:
-         return "Ask For Confirmation On Exit";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Collections";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY:
-         return "Content Database Dir";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_DIR:
-         return "Content Dir";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE:
-         return "History List Size";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS:
-         return "Quick Menu";
-      case MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIR:
-         return "Core Assets Dir";
-      case MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIRECTORY:
-         return "Downloads Dir";
-      case MENU_ENUM_LABEL_VALUE_CORE_CHEAT_OPTIONS:
-         return "Cheats";
-      case MENU_ENUM_LABEL_VALUE_CORE_COUNTERS:
-         return "Core Counters";
-      case MENU_ENUM_LABEL_VALUE_CORE_ENABLE:
-         return "Display core name";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFORMATION:
-         return "Core Information";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_AUTHORS:
-         return "Authors";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CATEGORIES:
-         return "Categories";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL:
-         return "Core label";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME:
-         return "Core name";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NOTES:
-         return "Core notes";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE:
-         return "Firmware";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES:
-         return "License(s)";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS:
-         return "Permissions";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS:
-         return "Supported extensions";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER:
-         return "System manufacturer";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME:
-         return "System name";
-      case MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
-         return "Controls";
-      case MENU_ENUM_LABEL_VALUE_CORE_LIST:
-         return "Load Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_OPTIONS:
-         return "Options";
-      case MENU_ENUM_LABEL_VALUE_CORE_SETTINGS:
-         return "Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE:
-         return "Automatically start a core";
-      case MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG:
-         return "Configuration Per-Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
-         return "Automatically extract downloaded archive";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL:
-         return "Buildbot Cores URL";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST:
-         return "Core Updater";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS:
-         return "Updater";
-      case MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE:
-         return "CPU Architecture:";
       case MENU_ENUM_LABEL_VALUE_CPU_CORES:
          return "CPU Cores:";
       case MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY:
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index a31f9aa64b..5f378765d6 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -322,3 +322,124 @@ MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE,
       "Hardcore Mode"
       )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS,
+      "Locked Achievements:"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ENTRY,
+      "Locked"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS,
+      "Retro Achievements"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL,
+      "Test unofficial"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS,
+      "Unlocked Achievements:"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY,
+      "Unlocked"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT,
+      "Close"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONFIG,
+      "Config"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONFIGURATIONS,
+      "Load Configuration"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS,
+      "Configuration"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT,
+      "Save Configuration On Exit"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT,
+      "Ask For Confirmation On Exit"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST,
+      "Collections"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY,
+      "Content Database Dir"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONTENT_DIR,
+      "Content Dir"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE,
+      "History List Size")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS,
+      "Quick Menu")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIR,
+      "Core Assets Dir")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIRECTORY,
+      "Downloads Dir")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_CHEAT_OPTIONS,
+      "Cheats")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_COUNTERS,
+      "Core Counters")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_ENABLE,
+      "Display core name")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFORMATION,
+      "Core Information")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_AUTHORS,
+      "Authors")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CATEGORIES,
+      "Categories")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL,
+      "Core label")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME,
+      "Core name")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NOTES,
+      "Core notes")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
+      "Firmware")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES,
+      "License(s)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS,
+      "Permissions")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS,
+      "Supported extensions")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER,
+      "System manufacturer")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME,
+      "System name")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS,
+      "Controls")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_LIST,
+      "Load Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_OPTIONS,
+      "Options")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_SETTINGS,
+      "Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE,
+      "Automatically start a core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG,
+      "Configuration Per-Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE,
+      "Automatically extract downloaded archive")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL,
+      "Buildbot Cores URL")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST,
+      "Core Updater")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS,
+      "Updater")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE,
+      "CPU Architecture:")