From 7278f055cb5ce02366625f67d6ad4201c437d74d Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 4 Oct 2020 17:37:39 +1000
Subject: [PATCH] FrontendCommon: Attempt two at hotkey translation

---
 src/core/host_interface.h                     |  1 -
 src/frontend-common/common_host_interface.cpp | 80 +++++++++----------
 2 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/src/core/host_interface.h b/src/core/host_interface.h
index fcb4f61ff..b1e7166fe 100644
--- a/src/core/host_interface.h
+++ b/src/core/host_interface.h
@@ -184,6 +184,5 @@ protected:
 };
 
 #define TRANSLATABLE(context, str) str
-#define TRANSLATABLE_NOOP(context, str)
 
 extern HostInterface* g_host_interface;
diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp
index 9c1044edd..d6c3a2216 100644
--- a/src/frontend-common/common_host_interface.cpp
+++ b/src/frontend-common/common_host_interface.cpp
@@ -1540,46 +1540,46 @@ void CommonHostInterface::RegisterSaveStateHotkeys()
   }
 
   // Dummy strings for translation because we construct them in a loop.
-  TRANSLATABLE_NOOP("Hotkeys", "Load Game State 1");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Game State 2");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Game State 3");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Game State 4");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Game State 5");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Game State 6");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Game State 7");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Game State 8");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Game State 9");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Game State 10");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Game State 1");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Game State 2");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Game State 3");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Game State 4");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Game State 5");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Game State 6");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Game State 7");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Game State 8");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Game State 9");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Game State 10");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Global State 1");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Global State 2");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Global State 3");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Global State 4");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Global State 5");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Global State 6");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Global State 7");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Global State 8");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Global State 9");
-  TRANSLATABLE_NOOP("Hotkeys", "Load Global State 10");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Global State 1");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Global State 2");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Global State 3");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Global State 4");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Global State 5");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Global State 6");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Global State 7");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Global State 8");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Global State 9");
-  TRANSLATABLE_NOOP("Hotkeys", "Save Global State 10");
+  (void)TRANSLATABLE("Hotkeys", "Load Game State 1");
+  (void)TRANSLATABLE("Hotkeys", "Load Game State 2");
+  (void)TRANSLATABLE("Hotkeys", "Load Game State 3");
+  (void)TRANSLATABLE("Hotkeys", "Load Game State 4");
+  (void)TRANSLATABLE("Hotkeys", "Load Game State 5");
+  (void)TRANSLATABLE("Hotkeys", "Load Game State 6");
+  (void)TRANSLATABLE("Hotkeys", "Load Game State 7");
+  (void)TRANSLATABLE("Hotkeys", "Load Game State 8");
+  (void)TRANSLATABLE("Hotkeys", "Load Game State 9");
+  (void)TRANSLATABLE("Hotkeys", "Load Game State 10");
+  (void)TRANSLATABLE("Hotkeys", "Save Game State 1");
+  (void)TRANSLATABLE("Hotkeys", "Save Game State 2");
+  (void)TRANSLATABLE("Hotkeys", "Save Game State 3");
+  (void)TRANSLATABLE("Hotkeys", "Save Game State 4");
+  (void)TRANSLATABLE("Hotkeys", "Save Game State 5");
+  (void)TRANSLATABLE("Hotkeys", "Save Game State 6");
+  (void)TRANSLATABLE("Hotkeys", "Save Game State 7");
+  (void)TRANSLATABLE("Hotkeys", "Save Game State 8");
+  (void)TRANSLATABLE("Hotkeys", "Save Game State 9");
+  (void)TRANSLATABLE("Hotkeys", "Save Game State 10");
+  (void)TRANSLATABLE("Hotkeys", "Load Global State 1");
+  (void)TRANSLATABLE("Hotkeys", "Load Global State 2");
+  (void)TRANSLATABLE("Hotkeys", "Load Global State 3");
+  (void)TRANSLATABLE("Hotkeys", "Load Global State 4");
+  (void)TRANSLATABLE("Hotkeys", "Load Global State 5");
+  (void)TRANSLATABLE("Hotkeys", "Load Global State 6");
+  (void)TRANSLATABLE("Hotkeys", "Load Global State 7");
+  (void)TRANSLATABLE("Hotkeys", "Load Global State 8");
+  (void)TRANSLATABLE("Hotkeys", "Load Global State 9");
+  (void)TRANSLATABLE("Hotkeys", "Load Global State 10");
+  (void)TRANSLATABLE("Hotkeys", "Save Global State 1");
+  (void)TRANSLATABLE("Hotkeys", "Save Global State 2");
+  (void)TRANSLATABLE("Hotkeys", "Save Global State 3");
+  (void)TRANSLATABLE("Hotkeys", "Save Global State 4");
+  (void)TRANSLATABLE("Hotkeys", "Save Global State 5");
+  (void)TRANSLATABLE("Hotkeys", "Save Global State 6");
+  (void)TRANSLATABLE("Hotkeys", "Save Global State 7");
+  (void)TRANSLATABLE("Hotkeys", "Save Global State 8");
+  (void)TRANSLATABLE("Hotkeys", "Save Global State 9");
+  (void)TRANSLATABLE("Hotkeys", "Save Global State 10");
 }
 
 void CommonHostInterface::RegisterAudioHotkeys()