From 9d43f7f03625c834f8f1d13fa618c1fa0975728e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 29 Aug 2018 21:25:47 +0200
Subject: [PATCH] Fix French

---
 intl/msg_hash_es.h     | 12 ++++++------
 intl/msg_hash_us.h     |  2 +-
 menu/cbs/menu_cbs_ok.c |  6 ------
 menu/drivers/xmb.c     |  2 --
 msg_hash.h             |  2 --
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h
index 1af2e08e4f..34ede5266d 100644
--- a/intl/msg_hash_es.h
+++ b/intl/msg_hash_es.h
@@ -6481,15 +6481,15 @@ MSG_HASH(
     "<li>reiniciar RetroArch si actualizaste algo con el \"Actualizador en línea\"</li></ul>\n"
     "Por último, el contenido debe coincidir las bases de datos existente de <a href=\"https://docs.libretro.com/guides/roms-playlists-thumbnails/#sources\">aquí</a>. Si aún no funciona, considere <a href=\"https://www.github.com/libretro/RetroArch/issues\">enviar un reporte de error.</a>"
     )
-MSG_HASH(
-    MENU_ENUM_LABEL_VALUE_SHOW_WIMP,
-    "Mostrar el menú de escritorio"
-    )
+#endif
 MSG_HASH(
     MENU_ENUM_SUBLABEL_SHOW_WIMP,
     "Abre el menú de escritorio si fue cerrado"
     )
-#endif
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHOW_WIMP,
+    "Mostrar el menú de escritorio"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QT_DONT_SHOW_AGAIN,
     "No mostrar esto de nuevo"
@@ -7421,4 +7421,4 @@ MSG_HASH(
 MSG_HASH(
     MSG_FAILED_TO_SET_DISK,
     "Fallo al establecer disco"
-    )
\ No newline at end of file
+    )
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 67eb6e7518..2bdf54430b 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -6485,6 +6485,7 @@ MSG_HASH(
     "<li>restart RetroArch if any of the above was just done</li></ul>\n"
     "Finally, the content must match existing databases from <a href=\"https://docs.libretro.com/guides/roms-playlists-thumbnails/#sources\">here</a>. If it is still not working, consider <a href=\"https://www.github.com/libretro/RetroArch/issues\">submitting a bug report</a>."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SHOW_WIMP,
     "Show Desktop Menu"
@@ -6493,7 +6494,6 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_SHOW_WIMP,
     "Opens the desktop menu if closed."
     )
-#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QT_DONT_SHOW_AGAIN,
     "Don't show this again"
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 69991840ff..6bce681d5f 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -88,9 +88,7 @@ enum
    ACTION_OK_SET_PATH_VIDEO_FILTER,
    ACTION_OK_SET_PATH_OVERLAY,
    ACTION_OK_SET_DIRECTORY,
-#ifdef HAVE_QT
    ACTION_OK_SHOW_WIMP,
-#endif
    ACTION_OK_LOAD_CHEAT_FILE_APPEND
 };
 
@@ -3531,9 +3529,7 @@ default_action_ok_cmd_func(action_ok_restart_content,          CMD_EVENT_RESET)
 default_action_ok_cmd_func(action_ok_screenshot,               CMD_EVENT_TAKE_SCREENSHOT)
 default_action_ok_cmd_func(action_ok_disk_cycle_tray_status,   CMD_EVENT_DISK_EJECT_TOGGLE)
 default_action_ok_cmd_func(action_ok_shader_apply_changes,     CMD_EVENT_SHADERS_APPLY_CHANGES)
-#ifdef HAVE_QT
 default_action_ok_cmd_func(action_ok_show_wimp,                CMD_EVENT_UI_COMPANION_TOGGLE)
-#endif
 
 static int action_ok_reset_core_association(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
@@ -4743,11 +4739,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS:
             BIND_ACTION_OK(cbs, action_ok_enable_settings);
             break;
-#ifdef HAVE_QT
          case MENU_ENUM_LABEL_SHOW_WIMP:
             BIND_ACTION_OK(cbs, action_ok_show_wimp);
             break;
-#endif
          case MENU_ENUM_LABEL_QUIT_RETROARCH:
             BIND_ACTION_OK(cbs, action_ok_quit);
             break;
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 049da29623..c97d052893 100755
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2380,9 +2380,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
                      return xmb->textures.list[XMB_TEXTURE_RECORD];
                   case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS:
                      return xmb->textures.list[XMB_TEXTURE_OSD];
-#ifdef HAVE_QT
                   case MENU_ENUM_LABEL_SHOW_WIMP:
-#endif
                   case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS:
                      return xmb->textures.list[XMB_TEXTURE_UI];
                   case MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS:
diff --git a/msg_hash.h b/msg_hash.h
index c68223c761..2a76a08cb5 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1505,9 +1505,7 @@ enum msg_hash_enums
    MENU_LABEL(BUILDBOT_ASSETS_URL),
    MENU_LABEL(CORE_SET_SUPPORTS_NO_CONTENT_ENABLE),
    MENU_LABEL(CLOSE_CONTENT),
-#ifdef HAVE_QT
    MENU_LABEL(SHOW_WIMP),
-#endif
    MENU_LABEL(QUIT_RETROARCH),
    MENU_LABEL(SHUTDOWN),
    MENU_LABEL(REBOOT),