From 03146e46043572c56d3d0f755d59f1af05deddfb Mon Sep 17 00:00:00 2001
From: Joel Puig Rubio <joel.puig.rubio@gmail.com>
Date: Tue, 19 Apr 2022 11:58:50 +0200
Subject: [PATCH] Label Valencian as a Catalan dialect (#13837)

---
 intl/msg_hash_us.h                 | 4 ++--
 libretro-common/include/libretro.h | 2 +-
 menu/drivers/rgui.c                | 2 +-
 menu/menu_setting.c                | 2 +-
 msg_hash.c                         | 6 +++---
 msg_hash.h                         | 2 +-
 retroarch.c                        | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 5aa389f066..a99ff16b1c 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -8256,8 +8256,8 @@ MSG_HASH(
    "Urdu - اُردُو (Restart Required)"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_LANG_VALENCIAN,
-   "Valencian - Valencià"
+   MENU_ENUM_LABEL_VALUE_LANG_CATALAN_VALENCIA,
+   "Catalan (Valencian) - Català (Valencià)"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LANG_VIETNAMESE,
diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index e8a03e519d..9bdbe816bf 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -287,7 +287,7 @@ enum retro_language
    RETRO_LANGUAGE_SWEDISH             = 25,
    RETRO_LANGUAGE_UKRAINIAN           = 26,
    RETRO_LANGUAGE_CZECH               = 27,
-   RETRO_LANGUAGE_VALENCIAN           = 28,
+   RETRO_LANGUAGE_CATALAN_VALENCIA    = 28,
    RETRO_LANGUAGE_LAST,
 
    /* Ensure sizeof(enum) == sizeof(int) */
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 984c5cd69a..224caac517 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -1696,7 +1696,7 @@ static bool rgui_fonts_init(rgui_t *rgui)
       case RETRO_LANGUAGE_FINNISH:
       case RETRO_LANGUAGE_INDONESIAN:
       case RETRO_LANGUAGE_SWEDISH:
-      case RETRO_LANGUAGE_VALENCIAN:
+      case RETRO_LANGUAGE_CATALAN_VALENCIA:
          /* We have at least partial support for
           * these languages, but extended ASCII
           * is required */
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 76c3f165b4..7960f446ba 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -6746,7 +6746,7 @@ static void setting_get_string_representation_uint_user_language(
    modes[RETRO_LANGUAGE_SWEDISH]                = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LANG_SWEDISH);
    modes[RETRO_LANGUAGE_UKRAINIAN]              = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LANG_UKRAINIAN);
    modes[RETRO_LANGUAGE_CZECH]                  = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LANG_CZECH);
-   modes[RETRO_LANGUAGE_VALENCIAN]              = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LANG_VALENCIAN);
+   modes[RETRO_LANGUAGE_CATALAN_VALENCIA]       = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LANG_CATALAN_VALENCIA);
    strlcpy(s, modes[*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE)], len);
 }
 #endif
diff --git a/msg_hash.c b/msg_hash.c
index 3e11ffd7f3..7810ee2ae7 100644
--- a/msg_hash.c
+++ b/msg_hash.c
@@ -115,7 +115,7 @@ int msg_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
       case RETRO_LANGUAGE_CZECH:
          ret = msg_hash_get_help_cs_enum(msg, s, len);
          break;
-      case RETRO_LANGUAGE_VALENCIAN:
+      case RETRO_LANGUAGE_CATALAN_VALENCIA:
          ret = msg_hash_get_help_val_enum(msg, s, len);
          break;
       default:
@@ -195,7 +195,7 @@ const char *get_user_language_iso639_1(bool limit)
          return "uk";
       case RETRO_LANGUAGE_CZECH:
          return "cs";
-      case RETRO_LANGUAGE_VALENCIAN:
+      case RETRO_LANGUAGE_CATALAN_VALENCIA:
          return "val";
    }
    return "en";
@@ -289,7 +289,7 @@ const char *msg_hash_to_str(enum msg_hash_enums msg)
       case RETRO_LANGUAGE_CZECH:
          ret = msg_hash_to_str_cs(msg);
          break;
-      case RETRO_LANGUAGE_VALENCIAN:
+      case RETRO_LANGUAGE_CATALAN_VALENCIA:
          ret = msg_hash_to_str_val(msg);
          break;
       default:
diff --git a/msg_hash.h b/msg_hash.h
index bd202f926a..0940b84180 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -2878,7 +2878,7 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_LANG_THAI,
    MENU_ENUM_LABEL_VALUE_LANG_UKRAINIAN,
    MENU_ENUM_LABEL_VALUE_LANG_URDU,
-   MENU_ENUM_LABEL_VALUE_LANG_VALENCIAN,
+   MENU_ENUM_LABEL_VALUE_LANG_CATALAN_VALENCIA,
    MENU_ENUM_LABEL_VALUE_LANG_WELSH,
    MENU_ENUM_LABEL_VALUE_LANG_YIDDISH,
    MENU_ENUM_LABEL_VALUE_AI_SERVICE_IMAGE_MODE,
diff --git a/retroarch.c b/retroarch.c
index 08f649c28e..6af58e539e 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -6125,7 +6125,7 @@ enum retro_language rarch_get_language_from_iso(const char *iso639)
       {"sv", RETRO_LANGUAGE_SWEDISH},
       {"uk", RETRO_LANGUAGE_UKRAINIAN},
       {"cs", RETRO_LANGUAGE_CZECH},
-      {"val", RETRO_LANGUAGE_VALENCIAN},
+      {"val", RETRO_LANGUAGE_CATALAN_VALENCIA},
    };
 
    if (string_is_empty(iso639))