diff --git a/command.c b/command.c
index 52e783aacb..a2d291aa96 100644
--- a/command.c
+++ b/command.c
@@ -116,10 +116,7 @@ static void command_parse_sub_msg(command_t *handle, const char *tok)
          handle->state[map[index].id] = true;
    }
    else
-      RARCH_WARN("%s \"%s\" %s.\n",
-            msg_hash_to_str(MSG_UNRECOGNIZED_COMMAND),
-            tok,
-            msg_hash_to_str(MSG_RECEIVED));
+      RARCH_WARN(msg_hash_to_str(MSG_UNRECOGNIZED_COMMAND), tok);
 }
 
 static void command_parse_msg(
diff --git a/disk_control_interface.c b/disk_control_interface.c
index d9b708d2f6..5c3c9ba998 100644
--- a/disk_control_interface.c
+++ b/disk_control_interface.c
@@ -298,19 +298,16 @@ bool disk_control_set_eject_state(
    /* Set eject state */
    if (disk_control->cb.set_eject_state(eject))
       snprintf(
-            msg, sizeof(msg), "%s %s",
+            msg, sizeof(msg), "%s",
             eject ? msg_hash_to_str(MSG_DISK_EJECTED) :
-                  msg_hash_to_str(MSG_DISK_CLOSED),
-            msg_hash_to_str(MSG_VIRTUAL_DISK_TRAY));
+                  msg_hash_to_str(MSG_DISK_CLOSED));
    else
    {
       error = true;
       snprintf(
-            msg, sizeof(msg), "%s %s %s",
-            msg_hash_to_str(MSG_FAILED_TO),
+            msg, sizeof(msg), "%s",
             eject ? msg_hash_to_str(MSG_VIRTUAL_DISK_TRAY_EJECT) :
-                  msg_hash_to_str(MSG_VIRTUAL_DISK_TRAY_CLOSE),
-            msg_hash_to_str(MSG_VIRTUAL_DISK_TRAY));
+                  msg_hash_to_str(MSG_VIRTUAL_DISK_TRAY_CLOSE));
    }
 
    if (!string_is_empty(msg))
diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h
index 27e8d36dfb..fe693d70f9 100644
--- a/intl/msg_hash_ar.h
+++ b/intl/msg_hash_ar.h
@@ -453,22 +453,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "البرنامج الثابت فيرموير"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "مفقود"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "هديه"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "إختياري"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "مطلوب"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "قفل النواة المثبتة"
@@ -8489,10 +8473,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "قراءة أول مسار بيانات..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "مستلم"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "انتهى التسجيل بسبب تغيير الحجم."
@@ -8741,10 +8721,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "فشل حساب حجم العرض! سوف يستمر في استخدام البيانات الخام. ربما لن يعمل هذا بشكل صحيح..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "صورة القرص الافتراضي."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "إخراج"
@@ -8753,14 +8729,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "غلق"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "فشل"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "نجح"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "لم يتم تكوين"
diff --git a/intl/msg_hash_ast.h b/intl/msg_hash_ast.h
index b33a289079..6cc48ded78 100644
--- a/intl/msg_hash_ast.h
+++ b/intl/msg_hash_ast.h
@@ -325,22 +325,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_REQUIRED_HW_API,
    "APIs gráfiques riquíes"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Falta"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Presente"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Opcional"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Ríquese"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Bloquiar el nucléu instaláu"
diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h
index 00b2dc2c31..deabcec07f 100644
--- a/intl/msg_hash_chs.h
+++ b/intl/msg_hash_chs.h
@@ -453,22 +453,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "固件"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "缺失"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "具备"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "可选"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "必需"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "锁定已安装核心"
@@ -10701,10 +10685,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "读取第一条数据轨..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "接收完毕"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "录制因改变大小而停止。"
@@ -10957,10 +10937,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "可视区域尺寸计算失败！将继续使用原始数据，这很可能不会正常工作。"
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "虚拟光驱托盘。"
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "弹出"
@@ -10969,14 +10945,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "关闭"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "已失败"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "已成功"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "未配置"
@@ -11395,10 +11363,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
    "分开 Joy-Con 手柄"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "内部存储状态"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "图形部件缩放倍数"
diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h
index f80b8dfd96..d7eabc0182 100644
--- a/intl/msg_hash_cht.h
+++ b/intl/msg_hash_cht.h
@@ -413,22 +413,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "韌體"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "遺失內容"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "目前"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "選用"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "必要項目"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "鎖定已安裝的核心"
@@ -5181,10 +5165,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "讀取第一條數據軌..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "接收完畢"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "錄製因改變大小而停止。"
@@ -5381,14 +5361,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "關閉"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "已失敗"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "已成功"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "未設定"
diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h
index f66f2230a9..7d61a5d2d2 100644
--- a/intl/msg_hash_de.h
+++ b/intl/msg_hash_de.h
@@ -429,18 +429,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_REQUIRED_HW_API,
    "Benötigte Grafik-API"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Fehlt"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Vorhanden"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Notwendig"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Installierten Core sperren"
@@ -10417,10 +10405,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "Lese ersten Daten-Track..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "empfangen"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "Aufzeichnung wurde wegen Größenänderung beendet."
@@ -10669,10 +10653,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Berechnung der Bildgröße fehlgeschlagen! Wird unter Verwendung von Rohdaten fortfahren. Dies wird wahrscheinlich nicht richtig funktionieren ..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "des virtuellen Laufwerkfachs."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "Auswerfen"
@@ -10681,14 +10661,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "Schließen"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "fehlgeschlagen"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "erfolgreich"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "nicht konfiguriert"
@@ -11107,10 +11079,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
    "Joy-Con teilen"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "Status des internen Speichers"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "Skalierungsüberschreibung für Grafik-Widgets"
diff --git a/intl/msg_hash_el.h b/intl/msg_hash_el.h
index dfc885a148..cdc8d660e5 100644
--- a/intl/msg_hash_el.h
+++ b/intl/msg_hash_el.h
@@ -453,22 +453,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "Λογισμικό"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Λείπει"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Παρόν"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Προεραιτικό"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Απαραίτητο"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Κλείδωμα Εγκατεστημένο Πυρήνα"
@@ -5165,10 +5149,6 @@ MSG_HASH(
    MSG_PAUSED,
    "Παύση."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "ελήφθη"
-   )
 MSG_HASH(
    MSG_RECORDING_TO,
    "Εγγραφή σε"
@@ -5221,14 +5201,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "κλείσει"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "απέτυχε"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "επιτεύχθηκε"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "δεν έχει ρυθμιστεί"
diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h
index d6793253e5..3f9874c5eb 100644
--- a/intl/msg_hash_es.h
+++ b/intl/msg_hash_es.h
@@ -449,22 +449,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_REQUIRED_HW_API,
    "API gráficas necesarias"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Faltante"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Presente"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Opcional"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Necesario"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Proteger núcleo instalado"
@@ -10769,10 +10753,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "Leyendo la primera pista de datos..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "recibido"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "Grabación terminada debido al cambio de tamaño."
@@ -11021,10 +11001,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "¡Error al calcular el tamaño del área de visualización! Se continuará utilizando datos en bruto. Probablemente no funcionará bien..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "la bandeja de discos virtual."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "expulsar"
@@ -11033,14 +11009,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "cerrar"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "fallida"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "completada"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "no configurado"
@@ -11459,10 +11427,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
    "Joy-Con separados"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "Estado del almacenamiento interno"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "Personalizar escala de widgets gráficos"
diff --git a/intl/msg_hash_fi.h b/intl/msg_hash_fi.h
index b686937394..0316c1c4ce 100644
--- a/intl/msg_hash_fi.h
+++ b/intl/msg_hash_fi.h
@@ -453,22 +453,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "Laiteohjelmisto"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Puuttuvat"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Läsnä"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Valinnaiset"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Vaaditut"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Lukitse asennettu ydin"
@@ -10777,10 +10761,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "Luetaan ensimmäistä dataraitaa..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "vastaanotettu"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "Nauhoitus keskeytettiin koon muuttamisen vuoksi."
@@ -11033,10 +11013,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Ikkunan koon laskenta epäonnistui! jatketaan raakadatan käyttöä. Tämä ei varmaan toimi oikein..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   " virtuaalinen levyasema."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "poistamaan "
@@ -11045,14 +11021,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "sulkemaan "
    )
-MSG_HASH(
-   MSG_FAILED,
-   "epäonnistui"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "onnistui"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "ei määritelty"
@@ -11475,10 +11443,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
    "Jaa Joy-Con"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "Sisäisen tallennustilan tilanne"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "Grafiikka-widgettien skaalauksen ohitus"
diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h
index 1b75309efd..e4862073e4 100644
--- a/intl/msg_hash_fr.h
+++ b/intl/msg_hash_fr.h
@@ -445,22 +445,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "Firmware(s) "
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Manquant"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Présent"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Optionnel"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Requis"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Verrouiller le cœur installé"
@@ -10765,10 +10749,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "Lecture de la première piste de données..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "reçu"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "Enregistrement interrompu à cause du redimensionnement."
@@ -11017,10 +10997,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Le calcul de la taille de la fenêtre d'affichage a échoué ! Continuera à utiliser les données brutes. Cela ne fonctionnera probablement pas correctement..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "lecteur de disque virtuel."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "éjecter"
@@ -11029,14 +11005,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "fermer"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "échoué"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "réussi"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "non configuré"
@@ -11459,10 +11427,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
    "Joy-Con détachés"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "État du stockage interne"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "Remplacement de l'échelle des widgets graphiques "
diff --git a/intl/msg_hash_gl.h b/intl/msg_hash_gl.h
index 698745532e..572c9a7f71 100644
--- a/intl/msg_hash_gl.h
+++ b/intl/msg_hash_gl.h
@@ -445,22 +445,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "Microprograma"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Ausente"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Presente"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Opcional"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Requirido"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Bloquear o núcleo instalado"
diff --git a/intl/msg_hash_he.h b/intl/msg_hash_he.h
index 08d5b944ea..3a39d53e52 100644
--- a/intl/msg_hash_he.h
+++ b/intl/msg_hash_he.h
@@ -169,23 +169,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "קושחה"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "חסר"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "קיים"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "אופציונלי"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "נדרש"
-   )
-
 /* Main Menu > Information > System Information */
 
 MSG_HASH(
diff --git a/intl/msg_hash_hu.h b/intl/msg_hash_hu.h
index d328e31801..29d0765409 100644
--- a/intl/msg_hash_hu.h
+++ b/intl/msg_hash_hu.h
@@ -249,11 +249,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS,
    "Engedélyek"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Hiányzó"
-   )
-
 /* Main Menu > Information > System Information */
 
 
diff --git a/intl/msg_hash_id.h b/intl/msg_hash_id.h
index eca89464fd..4103f0a714 100644
--- a/intl/msg_hash_id.h
+++ b/intl/msg_hash_id.h
@@ -441,22 +441,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_REQUIRED_HW_API,
    "Syarat Minimal Grafis API"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Tidak ada"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Ada"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Opsional"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Wajib"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Kunci Core Terpasang"
diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h
index 1b062b2d93..72d25c257c 100644
--- a/intl/msg_hash_it.h
+++ b/intl/msg_hash_it.h
@@ -441,22 +441,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_REQUIRED_HW_API,
    "Grafica API richiesta"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Mancante"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Presente"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Opzionale"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Richiesto"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Blocca Core Installato"
@@ -10669,10 +10653,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "Lettura in corso della prima traccia di dati..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "ricevuto"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "La registrazione è terminata a causa del ridimensionamento."
@@ -10921,10 +10901,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Il calcolo della dimensione di visualizzazione è fallito! Continuerà ad utilizzare dati grezzi. Questo probabilmente non funzionerà correttamente..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "vassoio del disco virtuale."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "espelli"
@@ -10933,14 +10909,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "chiudi"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "fallito"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "ha avuto successo"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "non configurato"
@@ -11363,10 +11331,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
    "Splitta i Joy-Con"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "Stato Memoria Interna"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "Scala Oggetti Grafici Override"
diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index 5d4452269f..0f86e1f61f 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -453,22 +453,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "ファームウェア"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "欠損"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "存在"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "任意"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "必須"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "インストール済みコアをロック"
@@ -10333,10 +10317,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Viewport size calculation failed! Will continue using raw data. This will probably not work right ..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "仮想ディスクトレイ."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "取り出し"
@@ -10345,14 +10325,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "閉じる"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "失敗しました"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "成功しました"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "設定されていません"
@@ -10751,10 +10723,6 @@ MSG_HASH(
 
 /* Environment Specific Settings */
 
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "内蔵ストレージ状態"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION,
    "スクリーン解像度"
diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h
index 2d164dd4bd..5a7cef4d42 100644
--- a/intl/msg_hash_ko.h
+++ b/intl/msg_hash_ko.h
@@ -453,22 +453,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "펌웨어"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "누락"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "사용 중"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "선택"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "필수"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "설치된 코어 잠금"
@@ -10877,10 +10861,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "첫 데이터 트랙 읽는 중..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "받음"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "리사이즈 때문에 기록 중지됨."
@@ -11133,10 +11113,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "뷰포트 크기 계산 실패! 원시 데이터를 계속 사용합니다. 정상 적인 동작을 보장할 수 없습니다..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "가상 디스크 트레이."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "꺼내기"
@@ -11145,14 +11121,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "닫기"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "실패"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "성공"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "설정 안 됨"
@@ -11575,10 +11543,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
    "Joy-Con 분할하기"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "내부 저장공간 상태"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "그래픽 위젯 크기조절 우선설정"
diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h
index 0d14002b99..16d61dd9fe 100644
--- a/intl/msg_hash_nl.h
+++ b/intl/msg_hash_nl.h
@@ -417,22 +417,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_REQUIRED_HW_API,
    "Vereiste Graphics API"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Ontbrekend"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Aanwezig"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Optioneel"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Vereist"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "De Geïnstalleerde Core Vergrendelen"
@@ -4213,10 +4197,6 @@ MSG_HASH(
    MSG_PAUSED,
    "Gepauzeerd."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "ontvangen"
-   )
 MSG_HASH(
    MSG_REWINDING,
    "Terugspoelen."
@@ -4265,10 +4245,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Viewport size calculation failed! Will continue using raw data. This will probably not work right ..."
    )
-MSG_HASH(
-   MSG_FAILED,
-   "gefaald"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "niet geconfigureerd"
diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h
index b5bc47aaeb..7bb92584c4 100644
--- a/intl/msg_hash_pl.h
+++ b/intl/msg_hash_pl.h
@@ -453,22 +453,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "Oprogramowanie układowe"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Brakujący"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Obecny"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Opcjonalny"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Wymagany"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Zablokuj zainstalowany rdzeń"
@@ -10677,10 +10661,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "Czytanie pierwszej ścieżki danych..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "Odebrane"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "Nagrywanie zakończyło się z powodu zmiany rozmiaru."
@@ -10925,10 +10905,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Obliczenie rozmiaru obszaru widoku nie powiodło się! Nadal używane będą surowe dane. To prawdopodobnie nie zadziała dobrze..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "wirtualna taca dysku."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "wysuń"
@@ -10937,14 +10913,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "zamknij"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "nie udało się"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "udało się"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "nie skonfigurowane"
@@ -11363,10 +11331,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
    "Podziel Joy-Con"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "Status pamięci wewnętrznej"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "Nadpisanie skali widżetów graficznych"
diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h
index 748b9c6fab..704735e628 100644
--- a/intl/msg_hash_pt_br.h
+++ b/intl/msg_hash_pt_br.h
@@ -445,22 +445,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_REQUIRED_HW_API,
    "API gráficas necessárias"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Faltando"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Presente"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Opcional"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Requerido"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Bloquear núcleo instalado"
@@ -10717,10 +10701,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "Lendo a primeira faixa de dados..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "recebido"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "A gravação terminou devido ao redimensionamento."
@@ -10969,10 +10949,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Falha no cálculo de tamanho da janela de exibição! Prosseguindo usando dados brutos. Isto poderá não funcionar corretamente..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "bandeja do disco virtual."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "ejetar"
@@ -10981,14 +10957,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "fechar"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "falhou"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "teve êxito"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "não configurado"
@@ -11407,10 +11375,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
    "Joy-Con separados"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "Condição do armazenamento interno"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "Substituição da escala dos widgets gráficos"
diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h
index da7b246138..c6ce4d2d49 100644
--- a/intl/msg_hash_pt_pt.h
+++ b/intl/msg_hash_pt_pt.h
@@ -449,22 +449,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_REQUIRED_HW_API,
    "API Gráficos Necessária"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Em falta"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Atual"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Opcional"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Obrigatório"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Bloqueio de núcleo instalado"
@@ -4665,10 +4649,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "Lendo a primeira pista de dados..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "Recebido"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "A gravação terminou devido ao redimensionamento."
@@ -4881,18 +4861,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Falha no cálculo do tamanho da janela de visualização! Continuarão a serem utilizados dados em bruto. Provavelmente, irão surgir erros ..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "Ícone do disco virtual na área de notificações."
-   )
-MSG_HASH(
-   MSG_FAILED,
-   "Falha"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "Sucesso"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "Não configurado"
diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h
index e9f585b04c..9005bb10f5 100644
--- a/intl/msg_hash_ru.h
+++ b/intl/msg_hash_ru.h
@@ -453,22 +453,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "Системные файлы"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Отсутствует"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Присутствует"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Необязательно"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Требуется"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Заблокировать ядро"
@@ -10877,10 +10861,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "Чтение начальной дорожки данных..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "получена"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "Отмена записи из-за изменения размера окна."
@@ -11133,10 +11113,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Ошибка расчёта области отображения. Будут использованы необработанные данные. Возможны ошибки."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "виртуальный лоток привода."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "извлечь"
@@ -11145,14 +11121,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "закрыть"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "Не удалось"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "удалось"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "не настроен"
@@ -11575,10 +11543,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
    "Разделить Joy-Con"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "Статус внутреннего хранилища"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "Замещение масштаба виджетов"
diff --git a/intl/msg_hash_sk.h b/intl/msg_hash_sk.h
index f02ca1e3f1..ccf308094d 100644
--- a/intl/msg_hash_sk.h
+++ b/intl/msg_hash_sk.h
@@ -445,22 +445,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "Firmvér(y)"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Chýba"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Prítomný"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Volitelné"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Požadované"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Uzamknúť Nainštalované Jadro"
diff --git a/intl/msg_hash_sv.h b/intl/msg_hash_sv.h
index f093b72493..06477d6c52 100644
--- a/intl/msg_hash_sv.h
+++ b/intl/msg_hash_sv.h
@@ -437,22 +437,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_REQUIRED_HW_API,
    "Grafik-API som krävs"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Saknas"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Tillgänglig"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Frivillig"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Obligatorisk"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Lås installerad kärna"
diff --git a/intl/msg_hash_tr.h b/intl/msg_hash_tr.h
index 4c37fcbacf..6a62ed42ed 100644
--- a/intl/msg_hash_tr.h
+++ b/intl/msg_hash_tr.h
@@ -445,22 +445,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
    "Ürün Yazılımı"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Eksik"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Mevcut"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "İsteğe bağlı"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Gerekli"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
    "Kurulu Çekirdeği Kilitle"
@@ -10873,10 +10857,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "İlk veri parçasını okunuyor..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "alındı"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "Kayıt yeniden boyutlandırma nedeniyle sonlandırıldı."
@@ -11129,10 +11109,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Görüntü alanı boyutu hesaplaması başarısız! Ham veriler kullanılmaya devam edilecek. Muhtemelen düzgün çalışmayacak..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "sanal disk tepsisi."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
    "çıkar"
@@ -11141,14 +11117,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "kapat"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "başarısız"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "başarılı"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "yapılandırılmamış"
@@ -11563,10 +11531,6 @@ MSG_HASH(
 
 /* Environment Specific Settings */
 
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "Dahili Depolama Durumu"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "Grafik Gereçleri Ölçeğini Özelleştir"
diff --git a/intl/msg_hash_uk.h b/intl/msg_hash_uk.h
index 41c2fd0930..8d11738dab 100644
--- a/intl/msg_hash_uk.h
+++ b/intl/msg_hash_uk.h
@@ -6649,10 +6649,6 @@ MSG_HASH(
    MSG_PAUSED,
    "Призупинено."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "отримано"
-   )
 MSG_HASH(
    MSG_RECORDING_TO,
    "Запис до"
@@ -6753,14 +6749,6 @@ MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
    "закрити"
    )
-MSG_HASH(
-   MSG_FAILED,
-   "помилка"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "успішно"
-   )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
    "не налаштовано"
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 050d74960e..f71a0dd2da 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -454,20 +454,20 @@ MSG_HASH(
    "Firmware"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   "Missing"
+   MENU_ENUM_LABEL_VALUE_MISSING_REQUIRED,
+   "Missing, Required:"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   "Present"
+   MENU_ENUM_LABEL_VALUE_MISSING_OPTIONAL,
+   "Missing, Optional:"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   "Optional"
+   MENU_ENUM_LABEL_VALUE_PRESENT_REQUIRED,
+   "Present, Required:"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
-   "Required"
+   MENU_ENUM_LABEL_VALUE_PRESENT_OPTIONAL,
+   "Present, Optional:"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LOCK,
@@ -10113,6 +10113,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PORT,
    "Port"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_PORT_DEVICE_NAME,
+   "Port %d device name: %s (#%d)"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_SETTINGS,
    "Cheat Settings"
@@ -11123,11 +11127,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MSG_DISK_CLOSED,
-   "Closed"
+   "Closed virtual disc tray."
    )
 MSG_HASH(
    MSG_DISK_EJECTED,
-   "Ejected"
+   "Ejected virtual disc tray."
    )
 MSG_HASH(
    MSG_DOWNLOADING,
@@ -11197,10 +11201,6 @@ MSG_HASH(
    MSG_FAILED_SAVING_CONFIG_TO,
    "Failed saving config to"
    )
-MSG_HASH(
-   MSG_FAILED_TO,
-   "Failed to"
-   )
 MSG_HASH(
    MSG_FAILED_TO_ACCEPT_INCOMING_SPECTATOR,
    "Failed to accept incoming spectator."
@@ -11553,10 +11553,6 @@ MSG_HASH(
    MSG_READING_FIRST_DATA_TRACK,
    "Reading first data track..."
    )
-MSG_HASH(
-   MSG_RECEIVED,
-   "received"
-   )
 MSG_HASH(
    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
    "Recording terminated due to resize."
@@ -11775,7 +11771,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MSG_UNRECOGNIZED_COMMAND,
-   "Unrecognized command"
+   "Unrecognized command \"%s\" received.\n"
    )
 MSG_HASH(
    MSG_USING_CORE_NAME_FOR_NEW_CONFIG,
@@ -11809,25 +11805,21 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Viewport size calculation failed! Will continue using raw data. This will probably not work right..."
    )
-MSG_HASH(
-   MSG_VIRTUAL_DISK_TRAY,
-   "virtual disc tray."
-   )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_EJECT,
-   "eject"
+   "Failed to eject virtual disc tray."
    )
 MSG_HASH(
    MSG_VIRTUAL_DISK_TRAY_CLOSE,
-   "close"
+   "Failed to close virtual disc tray."
    )
 MSG_HASH(
-   MSG_FAILED,
-   "failed"
+   MSG_AUTOLOADING_SAVESTATE_FAILED,
+   "Auto-loading save state from \"%s\" failed."
    )
 MSG_HASH(
-   MSG_SUCCEEDED,
-   "succeeded"
+   MSG_AUTOLOADING_SAVESTATE_SUCCEEDED,
+   "Auto-loading save state from \"%s\" succeeded."
    )
 MSG_HASH(
    MSG_DEVICE_NOT_CONFIGURED,
@@ -12255,10 +12247,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
    "Split Joy-Con"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-   "Internal Storage Status"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR,
    "Graphics Widgets Scale Override"
@@ -12529,11 +12517,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MSG_READ_WRITE,
-   "Read/Write"
+   "Internal Storage Status: Read/Write"
    )
 MSG_HASH(
    MSG_READ_ONLY,
-   "Read-Only"
+   "Internal Storage Status: Read-Only"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_BRIGHTNESS_CONTROL,
diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h
index 2b7c561f45..87be20f89b 100644
--- a/intl/msg_hash_vn.h
+++ b/intl/msg_hash_vn.h
@@ -1605,14 +1605,6 @@ MSG_HASH(
    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
    "Viewport size calculation failed! Will continue using raw data. This will probably not work right ..."
    )
-MSG_HASH(
-   MSG_FAILED,
-   "Bị Lỗi"
-   )
-MSG_HASH(
-   MSG_SUCCEEDED,
-   "Đã thành công"
-   )
 
 /* Lakka */
 
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index fc230d1872..c54913caf6 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -1005,8 +1005,8 @@ static int action_bind_sublabel_systeminfo_controller_entry(
    {
       if (input_config_get_device_autoconfigured(controller))
       {
-            snprintf(tmp, sizeof(tmp), "%s #%d device name: %s (#%d)",
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
+            snprintf(tmp, sizeof(tmp),
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT_DEVICE_NAME),
                controller,
                input_config_get_device_name(controller),
                input_config_get_device_name_index(controller));
@@ -1161,14 +1161,14 @@ static int action_bind_sublabel_remap_kbd_sublabel(
 {
    unsigned user_idx = (type - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN) / RARCH_ANALOG_BIND_LIST_END;
 
-   snprintf(s, len, "%s #%d: %s",
+   snprintf(s, len, "%s %u: %s",
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
          user_idx + 1,
          input_config_get_device_display_name(user_idx) ?
          input_config_get_device_display_name(user_idx) :
          (input_config_get_device_name(user_idx) ?
-            input_config_get_device_name(user_idx) :
-            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)));
+          input_config_get_device_name(user_idx) :
+          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)));
    return 0;
 }
 
@@ -1234,7 +1234,7 @@ static int action_bind_sublabel_remap_sublabel(
     * controller is connected... */
    port = settings->uints.input_joypad_index[port];
 
-   snprintf(s, len, "%s #%d: %s",
+   snprintf(s, len, "%s %u: %s",
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
          port + 1,
          input_config_get_device_display_name(port) ?
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 53f6d43fb2..7eaa7f9342 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -131,11 +131,9 @@ static int action_get_title_remap_port(
       unsigned menu_type, char *s, size_t len)
 {
    char lbl[128];
-   snprintf(lbl, sizeof(lbl), "%s %d %s",
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
-         atoi(path) + 1,
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS)
-         );
+   snprintf(lbl, sizeof(lbl),
+         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS),
+         atoi(path) + 1);
    SANITIZE_TO_STRING(s, lbl, len);
    return 1;
 }
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 7512f89eb1..0095b6889e 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -642,13 +642,15 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info,
             if (!core_info->firmware[i].desc)
                continue;
 
-            snprintf(tmp, sizeof(tmp), "(!) %s, %s: %s",
+            snprintf(tmp, sizeof(tmp), "(!) %s %s",
                   core_info->firmware[i].missing ?
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MISSING) :
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PRESENT),
-                  core_info->firmware[i].optional ?
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OPTIONAL) :
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_REQUIRED),
+                  (core_info->firmware[i].optional ?
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MISSING_OPTIONAL) :
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MISSING_REQUIRED))
+                  :
+                  (core_info->firmware[i].optional ?
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PRESENT_OPTIONAL) :
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PRESENT_REQUIRED)),
                   core_info->firmware[i].desc ?
                   core_info->firmware[i].desc :
                   msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME)
@@ -1352,8 +1354,7 @@ static unsigned menu_displaylist_parse_system_info(file_list_t *list)
 #ifdef ANDROID
    perms = test_permissions(internal_storage_path);
 
-   snprintf(tmp, sizeof(tmp), "%s: %s",
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS),
+   snprintf(tmp, sizeof(tmp), "%s",
          perms 
          ? msg_hash_to_str(MSG_READ_WRITE) 
          : msg_hash_to_str(MSG_READ_ONLY));
@@ -1440,8 +1441,8 @@ static unsigned menu_displaylist_parse_system_info(file_list_t *list)
    {
       if (input_config_get_device_autoconfigured(controller))
       {
-         snprintf(tmp, sizeof(tmp), "%s #%d device name: %s (#%d)",
-            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
+         snprintf(tmp, sizeof(tmp),
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT_DEVICE_NAME),
             controller,
             input_config_get_device_name(controller),
             input_config_get_device_name_index(controller));
@@ -4583,8 +4584,7 @@ static int menu_displaylist_parse_input_device_index_list(
                strlcpy(device_label, device_name, sizeof(device_label));
          }
          else
-            snprintf(device_label, sizeof(device_label),
-                  "%s (%s #%u)",
+            snprintf(device_label, sizeof(device_label), "%s (%s %u)",
                   msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
                   msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
                   map);
@@ -6248,11 +6248,9 @@ unsigned menu_displaylist_build_list(
             for (p = 0; p < max_users; p++)
             {
                char val_s[16], val_d[16];
-               snprintf(val_s, sizeof(val_s), "%s %d %s",
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
-                     p+1,
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS)
-                     );
+               snprintf(val_s, sizeof(val_s),
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS),
+                     p+1);
                snprintf(val_d, sizeof(val_d), "%d", p);
                if (menu_entries_append_enum(list, val_s, val_d,
                         MSG_UNKNOWN,
@@ -9989,7 +9987,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                            && !settings->bools.menu_show_sublabels)
                      {
                         snprintf(desc_label, sizeof(desc_label),
-                              "%s [%s %u]", descriptor, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), port + 1);
+                               "%s [%s %u]", descriptor,
+                               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), port + 1);
                         strlcpy(descriptor, desc_label, sizeof(descriptor));
                      }
 
@@ -10039,9 +10038,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                            && (max_users > 1)
                            && !settings->bools.menu_show_sublabels)
                      {
-                        snprintf(desc_label, sizeof(desc_label),
-                              "%s [%s %u]", descriptor,
-                              msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), port + 1);
+                        snprintf(desc_label, sizeof(desc_label), "%s [%s %u]",
+                              descriptor,
+                              msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
+                              port + 1);
                         strlcpy(descriptor, desc_label, sizeof(descriptor));
                      }
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index f64a95b71b..182b1b5b8c 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -7377,8 +7377,7 @@ static void get_string_representation_bind_device(rarch_setting_t *setting, char
             strlcpy(s, device_name, len);
       }
       else
-         snprintf(s, len,
-               "%s (%s #%u)",
+         snprintf(s, len, "%s (%s %u)",
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
                map);
diff --git a/msg_hash.h b/msg_hash.h
index 506dee6399..e0d56d5863 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -230,8 +230,8 @@ enum msg_hash_enums
    MSG_NATIVE,
    MSG_DYNAMIC,
    MSG_UNKNOWN_COMPILER,
-   MSG_FAILED,
-   MSG_SUCCEEDED,
+   MSG_AUTOLOADING_SAVESTATE_FAILED,
+   MSG_AUTOLOADING_SAVESTATE_SUCCEEDED,
    MSG_LOADING,
    MSG_FIRMWARE,
    MSG_CONNECTING_TO_PORT,
@@ -315,7 +315,6 @@ enum msg_hash_enums
    MSG_AUTO_SAVE_STATE_TO,
    MSG_RESTORING_DEFAULT_SHADER_PRESET_TO,
    MSG_SORRY_UNIMPLEMENTED_CORES_DONT_DEMAND_CONTENT_NETPLAY,
-   MSG_RECEIVED,
    MSG_LOADING_CONTENT_FILE,
    MSG_FATAL_ERROR_RECEIVED_IN,
    MSG_FAILED_TO_PATCH,
@@ -459,7 +458,6 @@ enum msg_hash_enums
    MSG_FAILED_TO,
    MSG_SAVING_RAM_TYPE,
    MSG_TO,
-   MSG_VIRTUAL_DISK_TRAY,
    MSG_REMOVED_DISK_FROM_TRAY,
    MSG_FAILED_TO_REMOVE_DISK_FROM_TRAY,
    MSG_VIRTUAL_DISK_TRAY_EJECT,
@@ -730,8 +728,6 @@ enum msg_hash_enums
    MENU_LABEL(START_NET_RETROPAD),
    MENU_LABEL(START_GONG),
 
-   MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
-
    /* System information */
    MENU_LABEL(CPU_CORES),
    MENU_LABEL(CPU_ARCHITECTURE),
@@ -2127,10 +2123,10 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_CORE,
    MENU_ENUM_LABEL_VALUE_CURSOR,
    MENU_ENUM_LABEL_VALUE_FILE,
-   MENU_ENUM_LABEL_VALUE_MISSING,
-   MENU_ENUM_LABEL_VALUE_PRESENT,
-   MENU_ENUM_LABEL_VALUE_OPTIONAL,
-   MENU_ENUM_LABEL_VALUE_REQUIRED,
+   MENU_ENUM_LABEL_VALUE_MISSING_REQUIRED,
+   MENU_ENUM_LABEL_VALUE_PRESENT_OPTIONAL,
+   MENU_ENUM_LABEL_VALUE_MISSING_OPTIONAL,
+   MENU_ENUM_LABEL_VALUE_PRESENT_REQUIRED,
    MENU_ENUM_LABEL_VALUE_RDB,
    MENU_ENUM_LABEL_VALUE_DIR,
    MENU_ENUM_LABEL_VALUE_NO_CORE,
@@ -2633,6 +2629,7 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_YES,
 
    MENU_ENUM_LABEL_VALUE_PORT,
+   MENU_ENUM_LABEL_VALUE_PORT_DEVICE_NAME,
 
    MENU_ENUM_LABEL_VALUE_LEFT_ANALOG,
    MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG,
diff --git a/tasks/task_save.c b/tasks/task_save.c
index e7b763e70f..4403032bed 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -988,10 +988,8 @@ static void task_load_handler(retro_task_t *task)
 
          snprintf(msg,
                8192 * sizeof(char),
-               "%s \"%s\" %s.",
-               msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_FROM),
-               state->path,
-               msg_hash_to_str(MSG_FAILED));
+               msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_FAILED),
+               state->path);
          task_set_error(task, strdup(msg));
          free(msg);
       }
@@ -1017,10 +1015,8 @@ static void task_load_handler(retro_task_t *task)
 
          if (state->autoload)
             snprintf(msg, msg_size - 1,
-                  "%s \"%s\" %s.",
-                  msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_FROM),
-                  state->path,
-                  msg_hash_to_str(MSG_SUCCEEDED));
+                  msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_SUCCEEDED),
+                  state->path);
          else
          {
             if (state->state_slot < 0)
diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp
index d3148846de..8c854dc1c2 100644
--- a/ui/drivers/ui_qt.cpp
+++ b/ui/drivers/ui_qt.cpp
@@ -2514,23 +2514,20 @@ QVector<QHash<QString, QString> > MainWindow::getCoreInfo()
                if (core_info->firmware[i].missing)
                {
                   missing        = true;
-                  labelText     += msg_hash_to_str(
-                        MENU_ENUM_LABEL_VALUE_MISSING);
+                  if (core_info->firmware[i].optional)
+                     labelText  += msg_hash_to_str(
+                           MENU_ENUM_LABEL_VALUE_MISSING_OPTIONAL);
+                  else
+                     labelText  += msg_hash_to_str(
+                           MENU_ENUM_LABEL_VALUE_MISSING_REQUIRED);
                }
                else
-                  labelText     += msg_hash_to_str(
-                        MENU_ENUM_LABEL_VALUE_PRESENT);
-
-               labelText        += ", ";
-
-               if (core_info->firmware[i].optional)
-                  labelText     += msg_hash_to_str(
-                        MENU_ENUM_LABEL_VALUE_OPTIONAL);
-               else
-                  labelText     += msg_hash_to_str(
-                        MENU_ENUM_LABEL_VALUE_REQUIRED);
-
-               labelText        += ":";
+                  if (core_info->firmware[i].optional)
+                     labelText  += msg_hash_to_str(
+                           MENU_ENUM_LABEL_VALUE_PRESENT_OPTIONAL);
+                  else
+                     labelText  += msg_hash_to_str(
+                           MENU_ENUM_LABEL_VALUE_PRESENT_REQUIRED);
 
                if (core_info->firmware[i].desc)
                   valueText      = core_info->firmware[i].desc;