From 02fefde05c50d9974694fdc58c60af1b0da06eb7 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 6 May 2007 05:25:09 +0000 Subject: [PATCH] bad merge --- stepmania/Themes/default/Languages/en.ini | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index d3341c6cd6..76a019f4e6 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -674,8 +674,8 @@ Chaos=Chaos Characters=Characters Choose=Choose Clear Bookkeeping Data=Clear Bookkeeping Data -Clear Profile Edits=Clear Profile Edits -Clear Profile Stats=Clear Profile Scores +Clear Machine Edits=Clear Machine Edits +Clear Machine Stats=Clear Machine Scores Clear area=Clear area Coin Options=Coin Options CoinMode=Coin\nMode @@ -993,10 +993,10 @@ Assist=Assist AutoPlay=AutoPlay Autosync=Autosync CPU=CPU -Clear Machine Stats=Clear Machine Stats +Clear Profile Stats=Clear Profile Scores CoinMode=CoinMode Debug Menu=Debug Menu -Fill Machine Stats=Fill Machine Stats +Fill Profile Stats=Fill Profile Stats Flush Log=Flush Log Force Crash=Force Crash Halt=Halt @@ -1005,6 +1005,7 @@ Machine=Machine Menu Timer=Menu Timer Monkey Input=Monkey Input Multitexture=Multitexture +Profile=Profile Pull Back Camera=Pull Back Camera Restart=Restart Reload=Reload