diff --git a/stepmania/Themes/default/Languages/de.ini b/stepmania/Themes/default/Languages/de.ini index 722edad4bc..e889a12ff4 100644 --- a/stepmania/Themes/default/Languages/de.ini +++ b/stepmania/Themes/default/Languages/de.ini @@ -1447,9 +1447,6 @@ HelpText=Auf &DOWN; drücken, um mitzumachen. Auf &LEFT; &RIGHT; drücken, um S [ScreenSongOptions] HelpText=&UP; &DOWN; schaltet zwischen Zeilen um &LEFT; &RIGHT; wählt Optionen an START Änderungen annehmen -[ScreenSoundOptions] -HelpText=&UP; &DOWN; schaltet zwischen Zeilen um &LEFT; &RIGHT; wählt Optionen an::START Änderungen annehmen ZURÜCK Änderungen verwerfen - [ScreenSyncOverlay] (hold Alt for smaller increment)=halte Alt für kleinere erhöhungen AutoPlay=Automatisches Spielen diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 085012b93b..c7e69cf877 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1429,9 +1429,6 @@ HelpText=Press &DOWN; on the pad to join. Press &LEFT; &RIGHT; to change styles [ScreenSongOptions] HelpText=&UP; &DOWN; to change line &LEFT; &RIGHT; to select between options START to accept changes -[ScreenSoundOptions] -HelpText=&UP; &DOWN; to change line &LEFT; &RIGHT; to select between options::START to accept changes BACK to discard changes - [ScreenStyleSplash] HelpText= diff --git a/stepmania/Themes/default/Languages/es.ini b/stepmania/Themes/default/Languages/es.ini index e063f6551e..a1f0de6f98 100644 --- a/stepmania/Themes/default/Languages/es.ini +++ b/stepmania/Themes/default/Languages/es.ini @@ -1406,9 +1406,6 @@ HelpText=Presione &DOWN; en el pad para unir. presione &LEFT; &RIGHT; para cambi [ScreenSongOptions] HelpText=&UP; &DOWN; para cambiar línea. &LEFT; &RIGHT; para seleccionar opciones START para aceptar cambios. -[ScreenSoundOptions] -HelpText=&UP; &DOWN; para cambiar línea. &LEFT; &RIGHT; para seleccionar opciones::START para aceptar cambios. HACIA ATRÁS para deshacer cambios. - [ScreenSyncOverlay] (hold Alt for smaller increment)=(Manten presionado Alt para un incremento menor) AutoPlay=Autoreproducción diff --git a/stepmania/Themes/default/Languages/fr.ini b/stepmania/Themes/default/Languages/fr.ini index d5b15b0704..fcba7c51ad 100644 --- a/stepmania/Themes/default/Languages/fr.ini +++ b/stepmania/Themes/default/Languages/fr.ini @@ -1425,9 +1425,6 @@ HelpText=Appuyez sur &DOWN; sur le pad pour participer. Appuyez sur &LEFT;&RIGHT [ScreenSongOptions] HelpText=&UP; &DOWN; pour changer de ligne &LEFT; &RIGHT; pour sélectionner les options DEMARRER pour accepter les changements -[ScreenSoundOptions] -HelpText=&UP; &DOWN; pour changer de ligne &LEFT; &RIGHT; pour sélectionner les options::DEMARRER pour accepter les changements RETOUR pour annuler les changements - [ScreenSyncOverlay] (hold Alt for smaller increment)=(maintenir Alt pour une plus petite augmentation) AutoPlay=AutoPlay diff --git a/stepmania/Themes/default/Languages/it.ini b/stepmania/Themes/default/Languages/it.ini index f332f7c4f9..e6d3391663 100644 --- a/stepmania/Themes/default/Languages/it.ini +++ b/stepmania/Themes/default/Languages/it.ini @@ -1419,9 +1419,6 @@ HelpText=Premi &DOWN; sulla pedana per entrare. Premi &LEFT; &RIGHT; per cambia [ScreenSongOptions] HelpText=&UP; &DOWN; per cambiare linea &LEFT; &RIGHT; per selezionare le opzioni AVVIA per accettare le modifiche -[ScreenSoundOptions] -HelpText=&UP; &DOWN; per cambiare linea &LEFT; &RIGHT; per selezionare le opzioni::AVVIA per accettare le modifiche INDIETRO per rifiutare le modifiche - [ScreenSyncOverlay] (hold Alt for smaller increment)=tenere premuto il tasto Alt per un incremento minore AutoPlay=Gioco Automatico diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 8b4bd44cb6..4cbcfb44de 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2963,6 +2963,8 @@ Line11="conf,RefreshRate" Line12="conf,Vsync" Line13="conf,ShowStats" Line14="conf,ShowBanners" +Line15="conf,AttractSoundFrequency" +Line16="conf,SoundVolume" [ScreenGameplayOptions] Fallback="ScreenOptionsServiceChild" @@ -3003,12 +3005,6 @@ Line1="conf,AutogenSteps" Line2="conf,AutogenGroupCourses" Line3="conf,FastLoad" -[ScreenSoundOptions] -Fallback="ScreenOptionsServiceChild" -LineNames="1,2" -Line1="conf,AttractSoundFrequency" -Line2="conf,SoundVolume" - [ScreenAttract] ResetGameState=true StartScreen=ScreenTitleBranch() @@ -3465,7 +3461,7 @@ ShowStyleIcon=false TimerSeconds=-1 AllowOperatorMenuButton=false -LineNames="1,4,5,6,7,8,9,10,11,12,13,14,15,16,17" +LineNames="1,4,5,6,7,8,9,11,12,13,14,15,16,17" # This NextScreen is only used for the "exit" choice. Line1="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options" Line4="gamecommand;screen,ScreenCoinOptions;name,Coin Options" @@ -3474,7 +3470,6 @@ Line6="gamecommand;screen,ScreenInputOptions;name,Input Options" Line7="gamecommand;screen,ScreenGameplayOptions;name,Gameplay Options" Line8="gamecommand;screen,ScreenGraphicOptions;name,Graphic Options" Line9="gamecommand;screen,ScreenMachineOptions;name,Machine Options" -Line10="gamecommand;screen,ScreenSoundOptions;name,Sound Options" Line11="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles" Line12="gamecommand;screen,ScreenOtherOptions;name,Other Options" Line13="gamecommand;screen,ScreenNetworkOptions;name,Network Options" @@ -3482,8 +3477,8 @@ Line14="gamecommand;screen,ScreenReloadSongs;name,Reload Songs" Line15="gamecommand;screen,ScreenTestInput;name,Test Input" Line16="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync" Line17="gamecommand;screen,ScreenCredits2;name,Stepmania Credits" -GroupedScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenCoinOptions,ScreenMapControllers,ScreenInputOptions,ScreenGameplayOptions,ScreenGraphicOptions,ScreenMachineOptions,ScreenSoundOptions,ScreenOptionsManageProfiles,ScreenOtherOptions,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2" -PersistScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenCoinOptions,ScreenMapControllers,ScreenInputOptions,ScreenGameplayOptions,ScreenGraphicOptions,ScreenMachineOptions,ScreenSoundOptions,ScreenOptionsManageProfiles,ScreenOtherOptions,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2" +GroupedScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenCoinOptions,ScreenMapControllers,ScreenInputOptions,ScreenGameplayOptions,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenOtherOptions,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2" +PersistScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenCoinOptions,ScreenMapControllers,ScreenInputOptions,ScreenGameplayOptions,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenOtherOptions,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2" [ScreenOptionsServiceChild] Fallback="ScreenOptionsMaster"