actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bad merge

Browse Source
This commit is contained in:
Glenn Maynard
2007-05-06 05:25:09 +00:00
parent f006256ceb
commit 02fefde05c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/Languages/en.ini
+5 -4
View File
@@ -674,8 +674,8 @@ Chaos=Chaos
Characters=Characters Characters=Characters
Choose=Choose Choose=Choose
Clear Bookkeeping Data=Clear Bookkeeping Data Clear Bookkeeping Data=Clear Bookkeeping Data
Clear Profile Edits=Clear Profile Edits Clear Machine Edits=Clear Machine Edits
Clear Profile Stats=Clear Profile Scores Clear Machine Stats=Clear Machine Scores
Clear area=Clear area Clear area=Clear area
Coin Options=Coin Options Coin Options=Coin Options
CoinMode=Coin\nMode CoinMode=Coin\nMode
@@ -993,10 +993,10 @@ Assist=Assist
AutoPlay=AutoPlay AutoPlay=AutoPlay
Autosync=Autosync Autosync=Autosync
CPU=CPU CPU=CPU
Clear Machine Stats=Clear Machine Stats Clear Profile Stats=Clear Profile Scores
CoinMode=CoinMode CoinMode=CoinMode
Debug Menu=Debug Menu Debug Menu=Debug Menu
Fill Machine Stats=Fill Machine Stats Fill Profile Stats=Fill Profile Stats
Flush Log=Flush Log Flush Log=Flush Log
Force Crash=Force Crash Force Crash=Force Crash
Halt=Halt Halt=Halt
@@ -1005,6 +1005,7 @@ Machine=Machine
Menu Timer=Menu Timer Menu Timer=Menu Timer
Monkey Input=Monkey Input Monkey Input=Monkey Input
Multitexture=Multitexture Multitexture=Multitexture
Profile=Profile
Pull Back Camera=Pull Back Camera Pull Back Camera=Pull Back Camera
Restart=Restart Restart=Restart
Reload=Reload Reload=Reload