From 5ff653837374ee39d74bf23a2681d3dad1dc6fb8 Mon Sep 17 00:00:00 2001
From: lasers <lasers@users.noreply.github.com>
Date: Thu, 17 Nov 2016 05:22:48 -0600
Subject: [PATCH] Change labels under Configurations

---
 intl/msg_hash_us.h      | 16 ++++++++--------
 intl/msg_hash_vn.c      | 10 +++++-----
 menu/menu_displaylist.c | 25 -------------------------
 3 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 0370a27c0d..5d63bf4d6b 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -209,11 +209,11 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE,
-      "Load Override Files Automatically"
+      "Load Core Overrides Automatically"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE,
-      "Load Remap Files Automatically"
+      "Load Remaps Automatically"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE,
@@ -381,7 +381,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONFIGURATIONS,
-      "Load Configuration"
+      "Load Configuration..."
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS,
@@ -389,11 +389,11 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT,
-      "Save Configuration On Exit"
+      "Save Configuration on Exit"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT,
-      "Ask For Confirmation On Exit"
+      "Ask for Confirmation on Exit"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST,
@@ -543,7 +543,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS,
       "Frontend Counters")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS,
-      "Load Content-specific core options automatically")
+      "Load Content Overrides Automatically")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE,
       "Create game-options file")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE,
@@ -1157,7 +1157,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME,
       "Save Game Overrides")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG,
-      "Save New Configuration")
+      "Create New Configuration")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_STATE,
       "Save State")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS,
@@ -1193,7 +1193,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON_SIMPLIFIED,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS,
       "Show Advanced Settings")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES,
-      "Show Hidden Files and Folders")
+      "Show Hidden Files & Folders")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHUTDOWN,
       "Shutdown")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO,
diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c
index eb70be8783..d4e3590f4a 100644
--- a/intl/msg_hash_vn.c
+++ b/intl/msg_hash_vn.c
@@ -3184,9 +3184,9 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
          return "Configuration";
       case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
-         return "Save Configuration On Exit";
+         return "Save Configuration on Exit";
       case MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT:
-         return "Ask For Confirmation 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:
@@ -3934,13 +3934,13 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY:
          return "Savestate Dir";
       case MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG:
-         return "Save Current Config";
+         return "Save Current Configuration";
       case MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE:
          return "Save Core Overrides";
       case MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME:
          return "Save Game Overrides";
       case MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG:
-         return "Save New Config";
+         return "Create New Configuration";
       case MENU_ENUM_LABEL_VALUE_SAVE_STATE:
          return "Save State";
       case MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS:
@@ -3976,7 +3976,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
       case MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS:
          return "Show Advanced thiết lập";
       case MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES:
-         return "Show Hidden Files and Folders";
+         return "Show Hidden Files & Folders";
       case MENU_ENUM_LABEL_VALUE_SHUTDOWN:
          return "Tắt Máy";
       case MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO:
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index aaff765601..887cb2c7ff 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2901,25 +2901,6 @@ static int menu_displaylist_parse_configurations_list(
          msg_hash_to_str(MENU_ENUM_LABEL_SAVE_NEW_CONFIG),
          MENU_ENUM_LABEL_SAVE_NEW_CONFIG,
          MENU_SETTING_ACTION, 0, 0);
-/*
-   menu_displaylist_parse_settings_enum(menu, info,
-         MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT,
-         PARSE_ONLY_BOOL, false);
-   menu_displaylist_parse_settings_enum(menu, info,
-         MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG,
-         PARSE_ONLY_BOOL, false);
-   menu_displaylist_parse_settings_enum(menu, info,
-         MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS,
-         PARSE_ONLY_BOOL, false);
-   menu_displaylist_parse_settings_enum(menu, info,
-         MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE,
-         PARSE_ONLY_BOOL, false);
-   menu_displaylist_parse_settings_enum(menu, info,
-         MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE,
-         PARSE_ONLY_BOOL, false);
-   menu_displaylist_parse_settings_enum(menu, info,
-         MENU_ENUM_LABEL_SHOW_HIDDEN_FILES,
-         PARSE_ONLY_BOOL, false); */
 
    menu_entries_append_enum(info->list,
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT),
@@ -2927,12 +2908,6 @@ static int menu_displaylist_parse_configurations_list(
          MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT,
          MENU_SETTING_ACTION, 0, 0);
 
-   menu_entries_append_enum(info->list,
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG),
-         msg_hash_to_str(MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG),
-         MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG,
-         MENU_SETTING_ACTION, 0, 0);
-
    menu_entries_append_enum(info->list,
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS),
          msg_hash_to_str(MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS),