huge merge

Themes/_fallback/Languages/en.ini

@@ -435,7 +435,7 @@ SoundResampleQuality=Advanced: Select the resampling quality to use.
 SoundVolume=Adjust the volume level during gameplay.
 SoundVolumeAttract=Adjust the volume level during attract mode.
 Speed=Speed
-Stepmania Credits=The Stepmania Development Team
+StepMania Credits=The StepMania Development Team.
 Steps=Steps
 Style=
 Test Input=Test the responsiveness of connected joysticks.
@@ -534,6 +534,7 @@ x2.5=2.5x
 8=8
 8th=8th
 9=9
+Actual=Actual
 Add=Additive
 All Music=All Music
 AllDifficulties=All Difficulties
@@ -706,6 +707,7 @@ Song BGAnimation=Song BGAnimation
 Song Bitmap=Song Bitmap
 Song Movie=Song Movie
 Space=Space
+Specified=Specified
 Split=Split
 Standard=Standard
 Start=Start
@@ -822,6 +824,7 @@ Delete=Delete
 Delete beat and shift up=Delete beat and shift up
 Description=Description
 Difficulty=Difficulty
+Display BPM=Display BPM
 DisplayAspectRatio=Aspect Ratio
 DisplayColorDepth=Display Color
 DisplayResolution=Display Resolution
@@ -843,6 +846,7 @@ Edit time signature (top)=Edit time signature (beats per measure)
 Edit time signature (bottom)=Edit time signature (single beat note value)
 Edit tickcount=Edit tickcount
 Edit combo=Edit combo
+Edit warp=Edit warp
 Editor options=Options
 EditorShowBGChangesPlay=Show Backgrounds
 Effect=Effect
@@ -900,9 +904,11 @@ Low Meter=Low Meter
 Advanced Options=Advanced Options
 Main title=Main title
 Main title transliteration=Main title transliteration
+Max BPM=Max Specified BPM
 MaxTextureResolution=Texture Resolution
 MenuTimer=Menu Timer
 Meter=Meter
+Min BPM=Min Specified BPM
 Mines=Mines
 MoveRandomToEnd=Random At End
 More Options=More Options
@@ -985,7 +991,7 @@ ShowSongOptions=Show Song Options
 ShowStats=Show Stats
 SmoothLines=SmoothLines
 SoundEffect=Sound Effect
-Stepmania Credits=Stepmania Credits
+StepMania Credits=StepMania Credits
 Center1Player=Center 1 Player
 Song=Song
 Song Group=Song Group
@@ -1209,6 +1215,7 @@ Enter a new Time Signature numerator value.=Enter the number of beats per measur
 Enter a new Time Signature denominator value.=Enter the note value that represents one beat.
 Enter a new Tickcount value.=Enter a new Tickcount value.
 Enter a new Combo value.=Enter a new Combo value.
+Enter a new Warp value.=Enter the beat you will warp to when you reach this point.
 Enter a new artist transliteration.=Enter a new artist transliteration.
 Enter a new artist.=Enter a new artist.
 Enter a new genre.=Enter a new genre.
@@ -1221,6 +1228,8 @@ Enter a new main title transliteration.=Enter a new main title transliteration.
 Enter a new main title.=Enter a new main title.
 Enter a new sub title transliteration.=Enter a new sub title transliteration.
 Enter a new sub title.=Enter a new sub title.
+Enter a new min BPM.=Enter the minimum displayed BPM.
+Enter a new max BPM.=Enter the maximum displayed BPM.
 More than %d notes per measure is not allowed.  This change has been reverted.=More than %d notes per measure is not allowed.  This change has been reverted.
 No backgrounds available=No backgrounds available
 EditHelpText=Up/Down:\n     change beat\nLeft/Right:\n     change snap\nNumber keys:\n     add/remove\n     tap note\nCreate hold note:\n     Hold a number\n     while moving\n     Up or Down\nCreate roll note:\n      Hold Shift,\n      then create a\n      hold note.\nSpace bar:\n     Set area\n     marker\nEnter:\n     Area Menu\nEscape:\n     Main Menu\nF1:\n     Show help\n
@@ -2221,18 +2230,6 @@ HeaderText=Edit Course
 HelpText=&MENUUP;&MENUDOWN; Move &MENULEFT;&MENURIGHT; Change Value
 [ScreenOptionsCourseOverview]
 HeaderText=Course Overview
-[ScreenQuickSetupOverview]
-HeaderText=Quick Setup - Welcome!
-[ScreenQuickSetupPhaseOne]
-HeaderText=Quick Setup - Page 1: Profile
-[ScreenQuickSetupPhaseTwo]
-HeaderText=Quick Setup - Page 2: Gameplay
-[ScreenQuickSetupPhaseThree]
-HeaderText=Quick Setup - Page 3: Appearance
-[ScreenQuickSetupPhaseFour]
-HeaderText=Quick Setup - Page 4: Extra
-[ScreenQuickSetupFinished]
-HeaderText=Quick Setup - Finished!
 [ScreenSelectProfile]
 HeaderText=Select Profile
 [ScreenSelectPlayStyle]