From 80c3beccb69c2d207bc5850f3dde0527776cd58c Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 15 Jun 2006 04:12:30 +0000
Subject: [PATCH] DeviceInputToLocalizedAndTranslatedString ->
 DeviceInputToLocalizedString (translation is a part of localization)

---
 stepmania/src/RageInputDevice.cpp | 2 +-
 stepmania/src/RageInputDevice.h   | 2 +-
 stepmania/src/ScreenEdit.cpp      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/RageInputDevice.cpp b/stepmania/src/RageInputDevice.cpp
index ad288d69d7..83e44ca36c 100644
--- a/stepmania/src/RageInputDevice.cpp
+++ b/stepmania/src/RageInputDevice.cpp
@@ -166,7 +166,7 @@ static LocalizedString BACKSLASH	( "DeviceButton", "Backslash" );
 
 /* Return the name of the button, as it probably appears on the device itself, such as a keycap;
  * eg. "a". */
-RString DeviceInputToLocalizedAndTranslatedString( DeviceInput di )
+RString DeviceInputToLocalizedString( DeviceInput di )
 {
 	switch( di.button )
 	{
diff --git a/stepmania/src/RageInputDevice.h b/stepmania/src/RageInputDevice.h
index 4b2f89d567..2e02963b14 100644
--- a/stepmania/src/RageInputDevice.h
+++ b/stepmania/src/RageInputDevice.h
@@ -339,7 +339,7 @@ public:
 	bool IsJoystick() const { return ::IsJoystick(device); }
 };
 
-RString DeviceInputToLocalizedAndTranslatedString( DeviceInput di );
+RString DeviceInputToLocalizedString( DeviceInput di );
 
 #endif
 /*
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 70882ffde4..4760bdb8ee 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -3585,9 +3585,9 @@ static RString GetDeviceButtonsLocalized( const vector<EditButton> &veb, const M
 			DeviceInput diPress = editmap.button[*eb][s];
 			DeviceInput diHold = editmap.hold[*eb][s];
 			if( diPress.IsValid() )
-				vsPress.push_back( DeviceInputToLocalizedAndTranslatedString(diPress) );
+				vsPress.push_back( DeviceInputToLocalizedString(diPress) );
 			if( diHold.IsValid() )
-				vsHold.push_back( DeviceInputToLocalizedAndTranslatedString(diHold) );
+				vsHold.push_back( DeviceInputToLocalizedString(diHold) );
 		}
 	}