bad merge
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user