diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 375d58ed79..f7afc89455 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,11 @@ ________________________________________________________________________________
 StepMania 5.0 Preview 3 | 2011081?
 --------------------------------------------------------------------------------
 
+2011/08/18
+----------
+* [RageInput] Added "No input devices were loaded." string to languages. [AJ]
+* [RageInputDevice] Added localized names for InputDeviceState. [AJ]
+
 2011/08/16
 ----------
 * Added PrettyPercent(numerator,denominator) Lua binding. [AJ]
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index e9d015f4e8..f150244a19 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -1168,6 +1168,15 @@ Voltage=Voltage
 MinMidiNote=MinMidiNote
 MaxMidiNote=MaxMidiNote
 
+[RageInput]
+No input devices were loaded.=No input devices were loaded.
+
+[RageInputDevice]
+Connected=Connected
+Unplugged=Unplugged
+NeedsMultitap=Needs a Multitap
+NoInputHandler=No Input Handler
+
 [RageSoundManager]
 Couldn't find a sound driver that works=Couldn't find a sound driver that works
 
diff --git a/src/RageInput.cpp b/src/RageInput.cpp
index e0a306a49f..5f71e80619 100644
--- a/src/RageInput.cpp
+++ b/src/RageInput.cpp
@@ -5,6 +5,7 @@
 #include "Foreach.h"
 #include "Preference.h"
 #include "LuaManager.h"
+#include "LocalizedString.h"
 
 RageInput* INPUTMAN = NULL; // globally accessable input device
 
@@ -48,6 +49,7 @@ RageInput::~RageInput()
 	LUA->UnsetGlobal( "INPUTMAN" );
 }
 
+static LocalizedString NO_INPUT_DEVICES_LOADED ( "RageInput", "No input devices were loaded." );
 void RageInput::LoadDrivers()
 {
 	for( unsigned i = 0; i < m_InputHandlers.size(); ++i )
@@ -64,7 +66,7 @@ void RageInput::LoadDrivers()
 
 	// If no input devices are loaded, the user won't be able to input anything.
 	if( apDevices.size() == 0 )
-		LOG->Warn( "No input devices were loaded." );
+		LOG->Warn( NO_INPUT_DEVICES_LOADED );
 }
 
 void RageInput::Update()
diff --git a/src/RageInputDevice.cpp b/src/RageInputDevice.cpp
index 544943bf84..96fbd205b4 100644
--- a/src/RageInputDevice.cpp
+++ b/src/RageInputDevice.cpp
@@ -5,6 +5,9 @@
 #include "RageInputDevice.h"
 #include "RageUtil.h"
 #include "Foreach.h"
+#include "LocalizedString.h"
+
+//static LocalizedString D3D_NOT_INSTALLED ( "RageDisplay_D3D", "DirectX 8.1 or greater is not installed.  You can download it from:" );
 
 static const char *InputDeviceStateNames[] = {
 	"Connected",
@@ -13,6 +16,7 @@ static const char *InputDeviceStateNames[] = {
 	"NoInputHandler",
 };
 XToString( InputDeviceState );
+XToLocalizedString( InputDeviceState );
 
 static map<DeviceButton,RString> g_mapNamesToString;
 static map<RString,DeviceButton> g_mapStringToNames;
@@ -57,13 +61,11 @@ static void InitNames()
 	g_mapNamesToString[KEY_RALT] = "right alt";
 	g_mapNamesToString[KEY_LMETA] = "left meta";
 	g_mapNamesToString[KEY_RMETA] = "right meta";
-	// Note: The super key means different things depending on the platform.
-	// On Windows, it's known as the Windows key. In other operating systems,
-	// it is the Super key. -aj
+	// Note: On Windows, the Super key is the Windows key. -aj
 	g_mapNamesToString[KEY_LSUPER] = "left super";
 	g_mapNamesToString[KEY_RSUPER] = "right super";
 	g_mapNamesToString[KEY_MENU] = "menu";
-	
+
 	g_mapNamesToString[KEY_FN] = "function";
 
 	g_mapNamesToString[KEY_NUMLOCK] = "num lock";