From 811044d2741783f569defcf35018e7d5f9d57be5 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 20 Jun 2015 01:19:07 +0200
Subject: [PATCH] (Menu) More menu hash changes

---
 menu/menu_hash.c    | 16 ++++++++++++++++
 menu/menu_hash.h    |  6 ++++++
 menu/menu_setting.c | 16 ++++++++--------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/menu/menu_hash.c b/menu/menu_hash.c
index 0cca4e1c6d..e2109e2e38 100644
--- a/menu/menu_hash.c
+++ b/menu/menu_hash.c
@@ -193,6 +193,22 @@ static const char *menu_hash_to_str_english(uint32_t hash)
 {
    switch (hash)
    {
+      case MENU_LABEL_NETPLAY_NICKNAME:
+         return "netplay_nickname";
+      case MENU_LABEL_VALUE_NETPLAY_NICKNAME:
+         return "Username";
+      case MENU_LABEL_USER_LANGUAGE:
+         return "user_language";
+      case MENU_LABEL_VALUE_USER_LANGUAGE:
+         return "Language";
+      case MENU_LABEL_CAMERA_ALLOW:
+         return "camera_allow";
+      case MENU_LABEL_VALUE_CAMERA_ALLOW:
+         return "Allow Camera";
+      case MENU_LABEL_LOCATION_ALLOW:
+         return "location_allow";
+      case MENU_LABEL_VALUE_LOCATION_ALLOW:
+         return "Allow Location";
       case MENU_LABEL_PAUSE_LIBRETRO:
          return "menu_pause_libretro";
       case MENU_LABEL_VALUE_PAUSE_LIBRETRO:
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 015d031285..820f748c12 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -200,7 +200,9 @@ extern "C" {
 #define MENU_LABEL_INPUT_AUTODETECT_ENABLE                                     0xb1e07facU
 
 #define MENU_LABEL_CAMERA_ALLOW                                                0xc14d302cU
+#define MENU_LABEL_VALUE_CAMERA_ALLOW                                          0x553824adU
 #define MENU_LABEL_LOCATION_ALLOW                                              0xf089275cU
+#define MENU_LABEL_VALUE_LOCATION_ALLOW                                        0xf039239dU
 
 #define MENU_LABEL_TURBO                                                       0x107434f1U
 
@@ -490,6 +492,10 @@ extern "C" {
 #define MENU_LABEL_VALUE_AUDIO_MUTE                                            0x5af25952U
 #define MENU_LABEL_EXIT_EMULATOR                                               0x86d5d467U
 #define MENU_LABEL_COLLECTION                                                  0x5fea5991U
+#define MENU_LABEL_USER_LANGUAGE                                               0x33ebaa27U
+#define MENU_LABEL_VALUE_USER_LANGUAGE                                         0xd230a5a9U
+#define MENU_LABEL_NETPLAY_NICKNAME                                            0x52204787U
+#define MENU_LABEL_VALUE_NETPLAY_NICKNAME                                      0x75de3125U
 
 #define MENU_VALUE_SECONDS                                                     0x8b0028d4U
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index e1b1432c63..7f7f6ff170 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -6455,8 +6455,8 @@ static bool setting_append_list_user_options(
 
    CONFIG_STRING(
          settings->username,
-         "netplay_nickname",
-         "Username",
+         menu_hash_to_str(MENU_LABEL_NETPLAY_NICKNAME),
+         menu_hash_to_str(MENU_LABEL_VALUE_NETPLAY_NICKNAME),
          "",
          group_info.name,
          subgroup_info.name,
@@ -6467,8 +6467,8 @@ static bool setting_append_list_user_options(
 
    CONFIG_UINT(
          settings->user_language,
-         "user_language",
-         "Language",
+         menu_hash_to_str(MENU_LABEL_USER_LANGUAGE),
+         menu_hash_to_str(MENU_LABEL_VALUE_USER_LANGUAGE),
          def_user_language,
          group_info.name,
          subgroup_info.name,
@@ -6957,8 +6957,8 @@ static bool setting_append_list_privacy_options(
 
    CONFIG_BOOL(
          settings->camera.allow,
-         "camera_allow",
-         "Allow Camera",
+         menu_hash_to_str(MENU_LABEL_CAMERA_ALLOW),
+         menu_hash_to_str(MENU_LABEL_VALUE_CAMERA_ALLOW),
          false,
          menu_hash_to_str(MENU_VALUE_OFF),
          menu_hash_to_str(MENU_VALUE_ON),
@@ -6970,8 +6970,8 @@ static bool setting_append_list_privacy_options(
 
    CONFIG_BOOL(
          settings->location.allow,
-         "location_allow",
-         "Allow Location",
+         menu_hash_to_str(MENU_LABEL_LOCATION_ALLOW),
+         menu_hash_to_str(MENU_LABEL_VALUE_LOCATION_ALLOW),
          false,
          menu_hash_to_str(MENU_VALUE_OFF),
          menu_hash_to_str(MENU_VALUE_ON),