From 40541d60c97adff911905be06d42723218fcdf8e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 17 Jul 2015 15:53:02 +0200
Subject: [PATCH] Add more translatable strings

---
 menu/cbs/menu_cbs_iterate.c | 37 +++++++++++++++++++++++++++----------
 menu/intl/menu_hash_us.c    | 19 ++++++++++++++++++-
 menu/menu_hash.h            | 10 ++++++++++
 3 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/menu/cbs/menu_cbs_iterate.c b/menu/cbs/menu_cbs_iterate.c
index 8e39a9722f..d58e49aea1 100644
--- a/menu/cbs/menu_cbs_iterate.c
+++ b/menu/cbs/menu_cbs_iterate.c
@@ -102,15 +102,24 @@ static int action_iterate_help(char *s, size_t len, const char *label)
             }
 
             snprintf(s, len,
-                  "Basic Menu controls:\n"
-                  "    Scroll (Up): %-20s\n"
-                  "  Scroll (Down): %-20s\n"
-                  "      Accept/OK: %-20s\n"
-                  "           Back: %-20s\n"
-                  "           Info: %-20s\n"
-                  "Enter/Exit Menu: %-20s\n"
-                  " Exit RetroArch: %-20s\n"
-                  "Toggle Keyboard: %-20s\n"
+                  "%s:\n"
+                  " \n"
+                  "[%s]: "
+                  "%-20s\n"
+                  "[%s]: "
+                  "%-20s\n"
+                  "[%s]: "
+                  "%-20s\n"
+                  "[%s]: "
+                  "%-20s\n"
+                  "[%s]: "
+                  "%-20s\n"
+                  "[%s]: "
+                  "%-20s\n"
+                  "[%s]: "
+                  "%-20s\n"
+                  "[%s]: "
+                  "%-20s\n"
                   " \n"
 
                   "To run content:\n"
@@ -120,7 +129,15 @@ static int action_iterate_help(char *s, size_t len, const char *label)
                   "See Path Settings to set directories \n"
                   "for faster access to files.\n"
                   " \n",
-                  desc[0], desc[1], desc[2], desc[3], desc[4], desc[5], desc[6], desc[7]
+                  menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS),              
+                  menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP),    desc[0],
+                  menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN),  desc[1],
+                  menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM),      desc[2],
+                  menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK),         desc[3],
+                  menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO),         desc[4],
+                  menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU),  desc[5],
+                  menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT),         desc[6],
+                  menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD), desc[7]
                   );
          }
          break;
diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c
index 3ad467d625..a65241e108 100644
--- a/menu/intl/menu_hash_us.c
+++ b/menu/intl/menu_hash_us.c
@@ -636,6 +636,24 @@ const char *menu_hash_to_str_us(uint32_t hash)
 
    switch (hash)
    {
+      case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS:
+         return "Basic menu controls";
+      case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP:
+         return "Scroll Up";
+      case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN:
+         return "Scroll Down";
+      case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM:
+         return "Confirm/OK";
+      case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK:
+         return "Back";
+      case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO:
+         return "Info";
+      case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU:
+         return "Toggle Menu";
+      case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT:
+         return "Quit";
+      case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD:
+         return "Toggle Keyboard";
       case MENU_LABEL_VALUE_OPEN_ARCHIVE:
          return "Open Archive As Folder";
       case MENU_LABEL_VALUE_LOAD_ARCHIVE:
@@ -1497,7 +1515,6 @@ int menu_hash_get_help_us(uint32_t hash, char *s, size_t len)
                "Welcome to RetroArch\n"
                "\n"
                "For further information, go to Help.\n"
-               " \n"
                );
          break;
       case MENU_LABEL_INPUT_DRIVER:
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index f09dcabe79..305092e742 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -22,6 +22,16 @@
 extern "C" {
 #endif
 
+#define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS                                   0x7c05810eU
+#define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP                         0x8c2f7b00U
+#define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN                       0x55f0f413U
+#define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM                           0x40e50edbU
+#define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK                              0xd834d89eU
+#define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO                              0xd838e6f9U
+#define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU                       0x98159c23U
+#define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT                              0xd83d6830U
+#define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD                   0xe408c2ffU
+
 #define MENU_LABEL_WELCOME_TO_RETROARCH                                        0xbcff0b3cU
 
 #define MENU_LABEL_DEFERRED_ARCHIVE_ACTION_DETECT_CORE                         0xdc9c0064U