Merge branch 'master' of https://github.com/Fighter19/stepmania

2015-05-06 10:06:12 +02:00
parent 73ee19b7cf 17533e7b95
commit ca3902373f
6 changed files with 102 additions and 19 deletions
@@ -1661,6 +1661,7 @@ HeaderText=Final Results
 GiveUpAbortedText=Don't give up!
 GiveUpStartText=Continue holding &START; to give up
 GiveUpBackText=Continue holding &BACK; to give up
+SkipSongText=Continue holding &SELECT; to skip song

 [ScreenGameplaySyncMachine]
 Standard deviation=Standard deviation
@@ -3452,6 +3452,7 @@ AllowCenter1Player=true
 FailOnMissCombo=FailCombo()
 GivingUpGoesToPrevScreen=false
 GivingUpGoesToNextScreen=false
+SelectSkipsSong=true
 #
 MinSecondsToStep=6.0
 MinSecondsToMusic=2.0