help text fixup

stepmania/Themes/default/Languages/de.ini

@@ -1321,7 +1321,6 @@ Revert sync changes=Synchronisationswechsel zurücksetzen
 Song offset - notes earlier/later=Songausgleich - Noten früher / später
 Sync changes reverted.=Synchronisationsveränderungen rückgängig gemacht.
 Collecting sample=gesammelte Beispiele
-HelpText=Schlag erhöhen, bis die Pfeile mit der Musik synchron sind::&BACK; drücken, wenn Sie fertig sind
 New offset=neu ausgleichen
 Old offset=alte ausgleichungen
 Standard deviation=standard abweichungen

stepmania/Themes/default/Languages/en.ini

@@ -1277,6 +1277,8 @@ Would you like to save these changes?=Would you like to save these changes?
 You have changed the timing of=You have changed the timing of
 
 [ScreenWithMenuElements]
+; Put all help text in this one group and have metrics look up the strings here.  That will help make sure
+; that strings are in a consistent style and that strings aren't duplicated.
 HelpTextNormal=Use &LEFT; &RIGHT; to select, then press START
 HelpTextDifficultyPart=&UP;&UP; easier difficulty     &DOWN;&DOWN; harder difficulty
 HelpTextOptions=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options   START to accept changes
@@ -1286,10 +1288,12 @@ HelpTextContinue=Press any button or key.  Press ESCAPE when done.
 HelpTextEval=Press START to continue
 HelpTextEvalScreenshot=Press SELECT to take a screenshot
 HelpTextTestInput=Press any button or key.  Press ESCAPE when done.
+HelpTextTestLights=Press &LEFT &RIGHT to cycle lights.  Press ESCAPE when done.
 HelpTextTextEntry=Type a value using the keyboard.  Press Enter to finish.
 HelpTextMapControllers=Use arrow keys to move, ENTER to assign, SPACE to clear::Press ESCAPE when done
 HelpTextOnline=smonline.us to connect to official Stepmania Online Server::Check out Stepmaniaonline.com for more information
 HelpTextNetSelectMusic=Ctrl + Enter to enter room/select song
+HelpTextBookkeeping=Press &LEFT &RIGHT to cycle data.  Press ESCAPE when done.
 
 [ScreenSelectGroup]
 ALL MUSIC=ALL MUSIC

stepmania/Themes/default/Languages/es.ini

@@ -1278,7 +1278,6 @@ Revert sync changes=Sync revertido cambia
 Song offset - notes earlier/later=offset de la cancion - notas  mas tempranar/mas tardes
 Sync changes reverted.=Revertidos los cambios sync.
 Collecting sample=Colectando muestra
-HelpText=Controlar el ritmo hasta que las flechas esten en sincronía con la música::Presiona &BACK; cuando hayas terminado
 New offset=Nuevo offset
 Old offset=Antiguo offset
 Standard deviation=Deviacion estandar

stepmania/Themes/default/Languages/fr.ini

@@ -1297,7 +1297,6 @@ Revert sync changes=Annuler les changements de synchronisation
 Song offset - notes earlier/later=Délai chanson - notes plus tôt/plus tard
 Sync changes reverted.=Changements sync. annulés.
 Collecting sample=Essais collectés
-HelpText=Confirmez les flèches jusqu'à ce qu'elles soient synchronisées avec le rythme de la musique::Appuyez sur &BACK; quand vous avez terminé
 New offset=Nouveau timing
 Old offset=Ancien timing
 Standard deviation=Timing par défaut

stepmania/Themes/default/Languages/it.ini

@@ -1291,7 +1291,6 @@ Revert sync changes=Inverti modifiche sincronizzazione
 Song offset - notes earlier/later=Struttura canzone - note prima/dopo
 Sync changes reverted.=Modifiche sincronizzazione revertite.
 Collecting sample=Raccolta esempi in corso
-HelpText=Balla a ritmo finché le frecce non sono in sync con la musica::quando hai finito premi &BACK;
 New offset=Nuova struttura
 Old offset=Vecchia struttura
 Standard deviation=Deviazione standard

stepmania/Themes/default/metrics.ini

@@ -144,7 +144,7 @@ NextScreen=ScreenCautionBranch()
 PrevScreen=ScreenTitleBranch()
 TimerSeconds=-1
 LoadEdits=true
-HelpText=
+HelpText=""
 
 [ScreenProfileSave]
 Class="ScreenProfileSave"
@@ -152,7 +152,7 @@ Fallback="ScreenWithMenuElements"
 NextScreen=SelectEndingScreen()
 PrevScreen=ScreenTitleBranch()
 TimerSeconds=-1
-HelpText=
+HelpText=""
 
 [ScreenWithMenuElements2]
 Fallback="ScreenWithMenuElements"
@@ -663,7 +663,7 @@ NextScreen=SMOnlineScreen()
 PrevScreen=ScreenTitleBranch()
 ShowStyleIcon=false
 TimerSeconds=-1
-HelpText= 
+HelpText=""
 
 [ScreenNetRoom]
 MusicSelectScreen="ScreenSMOnlineSelectMusic"
@@ -2252,6 +2252,7 @@ RightY=12+2
 Class="ScreenMapControllers"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
+HelpText=ScreenString("HelpTextMapControllers")
 ButtonsToMap=""
 LineScrollerOnCommand=%function(self) self:y(50) self:SetTransformFromHeight(24) end
 LineScrollerOffCommand=
@@ -2314,6 +2315,7 @@ Class="ScreenTestLights"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
+HelpText=ScreenString("HelpTextTestLights")
 TextX=SCREEN_CENTER_X-200
 TextY=SCREEN_CENTER_Y
 TextOnCommand=
@@ -2334,6 +2336,7 @@ Class="ScreenBookkeeping"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
+HelpText=ScreenString("HelpTextBookkeeping")
 AllTimeX=SCREEN_CENTER_X
 AllTimeY=110
 AllTimeOnCommand=zoom,0.7;diffuseshift;effectcolor1,0.5,0.5,0.5,1
@@ -2346,7 +2349,7 @@ DataOnCommand=zoom,0.6
 
 [ScreenPackages]
 Class="ScreenPackages"
-HelpText= 
+HelpText=""
 PackagesBGY=SCREEN_CENTER_Y
 PackagesBGX=SCREEN_WIDTH/4
 PackagesBGWidth=SCREEN_WIDTH/3
@@ -3419,7 +3422,7 @@ NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
 LineNames="1"
 Line1="lua,OptionsRowTest()"
-HelpText= 
+HelpText=""
 
 [TextBanner]
 TitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");horizalign,right
@@ -3977,7 +3980,7 @@ ItemUseRateSeconds=0
 Class="ScreenMiniMenu"
 Fallback="ScreenOptions"
 PrevScreen=
-HelpText=
+HelpText=""
 TimerSeconds=-1
 ShowExplanations=false
 ShowExitRow=false
@@ -4132,7 +4135,7 @@ ItemsStartX=0
 LineHighlightX=0
 ColorSelected=color("1,1,1,1")
 ColorNotSelected=color("0.7,0.7,0.7,1")
-HelpText= 
+HelpText=""
 
 [ScreenOptionsManage]
 Fallback="ScreenOptionsSimple"
@@ -4163,7 +4166,7 @@ WrapValueInRow=false
 NavigationMode="menu"
 ForceAllPlayers=true
 InputMode="together"
-HelpText=
+HelpText=""
 
 [ScreenOptionsManageCourses]
 Class="ScreenOptionsManageCourses"

stepmania/src/StepMania-net2003.vcproj

@@ -212,7 +212,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 "$(intdir)\verstub.obj""
 				AdditionalDependencies="libjpeg/jpeg.lib libpng/lib/libpng.lib"
-				OutputFile="C:\cvs\piu\Program\StepMania-fastdebug.exe"
+				OutputFile="..\Program\StepMania-fastdebug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""