diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c
index c5e6ad4ea4..6e776e1dd0 100644
--- a/intl/msg_hash_chs.c
+++ b/intl/msg_hash_chs.c
@@ -3126,6 +3126,7 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_DESCRIPTION:
          return "描述";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE:
+/* FIXME? Translate 'Achievements Hardcore Mode' */
          return "专家模式";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS:
          return "已解锁的成就:";
@@ -3134,6 +3135,7 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS:
          return "Retro 成就";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL:
+/* FIXME? Translate 'Test Unofficial Achievements' */
          return "非官方测试";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS:
          return "未解锁的成就:";
@@ -3274,6 +3276,7 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
          return "动态壁纸目录";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE:
+/* FIXME? Translate 'Enable Achievements' */
          return "启用";
       case MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR:
          return "菜单项悬停颜色";
diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c
index 1d7843028d..34290b518b 100644
--- a/intl/msg_hash_es.c
+++ b/intl/msg_hash_es.c
@@ -1272,10 +1272,11 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_DESCRIPTION:
          return "Descripción";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE:
-         return "Modo Extremo";
+         return "Logros Modo Extremo";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS:
          return "Retrologros";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL:
+/* FIXME? Translate 'Test Unofficial Achievements' */
          return "Probar versión no oficial";
       case MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS:
          return "Menú rápido";
@@ -1697,6 +1698,7 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
          return "Carpeta de fondos de pantalla dinámicos";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE:
+/* FIXME? Translate 'Enable Achievements' */
          return "Activar";
       case MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR:
          return "Color de entrada resaltada del menú";
diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c
index cd0a7e48a0..af27b24523 100644
--- a/intl/msg_hash_it.c
+++ b/intl/msg_hash_it.c
@@ -1146,12 +1146,14 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU:
          return "Menù a comparsa";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE:
+/* FIXME? Translate 'Achievements Hardcore Mode' */
          return "Modalità Hardcore";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS:
          return "Obiettivi bloccati:";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS:
          return "Retro Obiettivi";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL:
+/* FIXME? Translate 'Test Unofficial Achievements' */
          return "Prova non ufficiali";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS:
          return "Obiettivi sbloccati:";
@@ -2127,6 +2129,7 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER:
          return "Usa visualizzatore di immagini interno";
       case MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE:
+/* FIXME? Translate 'Enable Achievements' */
          return "Attivare";
       case MENU_ENUM_LABEL_VALUE_START_CORE:
          return "Avvia Core";
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index ae1e9fb0ab..f7f6e8eca7 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -341,7 +341,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE,
-      "Hardcore Mode"
+      "Achievements Hardcore Mode"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS,
@@ -357,7 +357,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL,
-      "Test unofficial"
+      "Test Unofficial Achievements"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS,
@@ -521,7 +521,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY,
       "Dynamic Wallpapers Dir")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE,
-      "Enable")
+      "Enable Achievements")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR,
       "Menu entry hover color")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR,
diff --git a/msg_hash.h b/msg_hash.h
index 8550597cfa..a81fde260b 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -832,28 +832,16 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_MENU_ENUM_THROTTLE_FRAMERATE,
    MENU_ENUM_LABEL_VALUE_MENU_ENUM_THROTTLE_FRAMERATE,
 
-   MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYNAMIC_SUPPORT,
-
-   MENU_ENUM_LABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
-   MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE,
-
-   MENU_ENUM_LABEL_CHEEVOS_TEST_UNOFFICIAL,
-   MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL,
-
-   MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS,
-
-   MENU_ENUM_LABEL_CHEEVOS_ENABLE,
-   MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE,
-
-
-   MENU_ENUM_LABEL_CHEEVOS_DESCRIPTION,
-   MENU_ENUM_LABEL_VALUE_CHEEVOS_DESCRIPTION,
-
    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,
+
+   MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS,
+
    MENU_ENUM_LABEL_CHEEVOS_USERNAME,
    MENU_ENUM_LABEL_CHEEVOS_PASSWORD,
 
@@ -863,6 +851,18 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME,
    MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME,
 
+   MENU_ENUM_LABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
+   MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE,
+
+   MENU_ENUM_LABEL_CHEEVOS_TEST_UNOFFICIAL,
+   MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL,
+
+   MENU_ENUM_LABEL_CHEEVOS_ENABLE,
+   MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE,
+
+   MENU_ENUM_LABEL_CHEEVOS_DESCRIPTION,
+   MENU_ENUM_LABEL_VALUE_CHEEVOS_DESCRIPTION,
+
    MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ACHIEVEMENTS,
    MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS,