merge InputOptions into MachineOptions

stepmania/Themes/default/Languages/de.ini

@@ -479,7 +479,6 @@ Graphic Options=Auflösung und Texturoptionen ändern.
 HiddenSongs=Einige Songs lassen sich nur bei Oni Kursen und Roulette abspielen.  Lassen Sie diese Option &oq;AUS&cq;, wenn alle Songs immer angezeigt werden sollen.
 Hide=Verbergen
 Holds=Haltepfeile
-Input Options=Verändert Autoplay, Automatische Funktionsbelegung und andere Eingabeoptionen.
 Insert=Einfügen
 Insert Credit=Münze Einwerfen
 Key Joy Mappings=Tastatur und Joystickbelegung verändern.
@@ -895,7 +894,6 @@ HiddenSongs=Verborgene\nSongs
 Hide=Verbergen
 High Meter=Hoch-Anzeige
 Holds=Halte
-Input Options=Eingabe-Optionen
 Insert=Einfügen
 Insert Credit=Kredit Einwerfen
 Insert Entry=Eintrag einsetzen
@@ -1252,9 +1250,6 @@ Standard deviation=standard abweichungen
 [ScreenGraphicOptions]
 HelpText=&UP; &DOWN; schaltet zwischen Zeilen um    &LEFT; &RIGHT; wählt Optionen an::START Änderungen annehmen  ZURÜCK Änderungen verwerfen
 
-[ScreenInputOptions]
-HelpText=&UP; &DOWN; schaltet zwischen Zeilen um    &LEFT; &RIGHT; wählt Optionen an::START Änderungen annehmen  ZURÜCK Änderungen verwerfen
-
 [ScreenInstructions]
 HelpText=START drücken, um fortzufahren
 

stepmania/Themes/default/Languages/en.ini

@@ -331,7 +331,6 @@ Group=
 HiddenSongs=Some songs are only playable during Oni courses and with roulette.  Leave this &oq;OFF&cq; to always display all songs.
 Hide=Hide
 Holds=Holds
-Input Options=Change autoplay, auto mapping, and other input-related options.
 Insert=Insert
 Insert Credit=Insert Credit
 Key Joy Mappings=Map keys and joystick buttons to game functions.
@@ -777,7 +776,6 @@ HiddenSongs=Hidden Songs
 Hide=Hide
 High Meter=High Meter
 Holds=Holds
-Input Options=Input Options
 Insert=Insert
 Insert Credit=Insert Credit
 Insert beat and shift down=Insert beat and shift down
@@ -1180,9 +1178,6 @@ Standard deviation=Standard deviation
 [ScreenGraphicOptions]
 HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::START to accept changes   BACK to discard changes
 
-[ScreenInputOptions]
-HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::START to accept changes   BACK to discard changes
-
 [ScreenInstructions]
 HelpText=Press START to continue
 PlayMode_Regular title=How To Play

stepmania/Themes/default/Languages/es.ini

@@ -478,7 +478,6 @@ Graphic Options=Cambiar la resolución y las opciones de textura.
 HiddenSongs=Algunas canciones sólo se pueden reproducir durante los courses ONI y con la ruleta. Deja este &oq;APAGADO&cq; para que muestre siempre todas las canciones.
 Hide=Ocultar
 Holds=Holds
-Input Options=Cambia el autoplay, el automapeado y otras opciones de input.
 Insert=Insertar
 Insert Credit=Insertar Crédito
 Key Joy Mappings=Asigna las teclas y botones del joystick para las funciones del juego.
@@ -854,7 +853,6 @@ HiddenSongs=Canciones\nOcultas
 Hide=Ocultar
 High Meter=medidor alto
 Holds=Holds
-Input Options=Opciones de Input
 Insert=Insertar
 Insert Credit=Insertar Créditos
 Insert Entry=insertar entrada
@@ -1211,9 +1209,6 @@ Standard deviation=Deviacion estandar
 [ScreenGraphicOptions]
 HelpText=&UP; &DOWN; para cambiar línea. &LEFT; &RIGHT;  para seleccionar opciones::START para aceptar cambios. HACIA ATRÁS para deshacer cambios.
 
-[ScreenInputOptions]
-HelpText=&UP; &DOWN; para cambiar línea. &LEFT; &RIGHT;  para seleccionar opciones::START para aceptar cambios. HACIA ATRÁS para deshacer cambios.
-
 [ScreenInstructions]
 HelpText=Presione START para continuar
 

stepmania/Themes/default/Languages/fr.ini

@@ -456,7 +456,6 @@ Graphic Options=Changer les options de résolution et de texture.
 HiddenSongs=Certaines chansons ne peuvent être sélectionnées que pendant les courses Oni et avec la roulette. Sélectionnez &oq;OFF&cq; pour toujours afficher toutes les chansons.
 Hide=Cacher
 Holds=Pas figés
-Input Options=Changer l'autoplay, la configuration automatique des touches, et les autres options d'entrée.
 Insert=Insérer
 Insert Credit=Insérer Crédit
 Key Joy Mappings=Configurer les touches et\nles boutons des contrôleurs.
@@ -872,7 +871,6 @@ HiddenSongs=Chansons\nCachées
 Hide=Cacher
 High Meter=Difficulté maximale
 Holds=Pas figés
-Input Options=Options d'entrée
 Insert=Insérer
 Insert Credit=Insérer Crédit
 Insert Entry=Insérer une entrée
@@ -1230,9 +1228,6 @@ Standard deviation=Timing par défaut
 [ScreenGraphicOptions]
 HelpText=&UP; &DOWN; pour changer de ligne &LEFT; &RIGHT; pour sélectionner les options::DEMARRER pour accepter les changements RETOUR pour annuler les changements
 
-[ScreenInputOptions]
-HelpText=&UP; &DOWN; pour changer de ligne &LEFT; &RIGHT; pour sélectionner les options::DEMARRER pour accepter les changements RETOUR pour annuler les changements
-
 [ScreenInstructions]
 HelpText=Appuyez sur DEMARRER pour continuer
 

stepmania/Themes/default/Languages/it.ini

@@ -451,7 +451,6 @@ Graphic Options=Cambia la risoluzione e le impostazioni della struttura.
 HiddenSongs=Alcune canzoni sono ascoltabili solo durante i percorsi Oni e con la roulette. Lasciate &oq;OFF&cq; per visualizzare sempre tutte le canzoni.
 Hide=Nascondi
 Holds=Fermate
-Input Options=Cambia autoplay, auto mapping e altre impostazioni di immissione.
 Insert=Inserisci
 Insert Credit=Inserisci credito
 Key Joy Mappings=Imposta i tasti e i bottoni del joystick per le funzioni del gioco.
@@ -867,7 +866,6 @@ HiddenSongs=Canzoni\nSegrete
 Hide=Nascondi
 High Meter=Contatore veloce
 Holds=Fermate
-Input Options=Opzioni Input
 Insert=Inserisci
 Insert Credit=Inserisci credito
 Insert Entry=Inserisci voce
@@ -1224,9 +1222,6 @@ Standard deviation=Deviazione standard
 [ScreenGraphicOptions]
 HelpText=&UP; &DOWN; per cambiare linea   &LEFT; &RIGHT; per selezionare le opzioni::AVVIA per accettare le modifiche
 
-[ScreenInputOptions]
-HelpText=&UP; &DOWN; per cambiare linea   &LEFT; &RIGHT; per selezionare le opzioni::AVVIA per accettare le modifiche
-
 [ScreenInstructions]
 HelpText=Premi AVVIA per continuare
 

stepmania/Themes/default/metrics.ini

@@ -2912,19 +2912,9 @@ MorePage2OffCommand=
 IdleCommentSeconds=0
 IdleTimeoutSeconds=0
 
-[ScreenInputOptions]
-Fallback="ScreenOptionsServiceChild"
-LineNames="1,2,3,4,5,6"
-Line1="conf,AutoMapOnJoyChange"
-Line2="conf,OnlyDedicatedMenuButtons"
-Line3="conf,AutoPlay"
-Line4="conf,DelayedBack"
-Line5="conf,ArcadeOptionsNavigation"
-Line6="conf,MusicWheelSwitchSpeed"
-
 [ScreenMachineOptions]
 Fallback="ScreenOptionsServiceChild"
-LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21"
+LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27"
 Line1="conf,MenuTimer"
 Line2="conf,ScoringType"
 Line3="conf,TimingWindowScale"
@@ -2946,6 +2936,12 @@ Line18="conf,SongsPerPlay"
 Line19="conf,CoinsPerCredit"
 Line20="conf,Premium"
 Line21="conf,EventMode"
+Line22="conf,AutoMapOnJoyChange"
+Line23="conf,OnlyDedicatedMenuButtons"
+Line24="conf,AutoPlay"
+Line25="conf,DelayedBack"
+Line26="conf,ArcadeOptionsNavigation"
+Line27="conf,MusicWheelSwitchSpeed"
 
 [ScreenGraphicOptions]
 Fallback="ScreenOptionsServiceChild"
@@ -3453,11 +3449,10 @@ ShowStyleIcon=false
 TimerSeconds=-1
 
 AllowOperatorMenuButton=false
-LineNames="1,5,6,8,9,11,12,13,14,15,16,17"
+LineNames="1,5,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"
 Line5="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
-Line6="gamecommand;screen,ScreenInputOptions;name,Input Options"
 Line8="gamecommand;screen,ScreenGraphicOptions;name,Graphic Options"
 Line9="gamecommand;screen,ScreenMachineOptions;name,Machine Options"
 Line11="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
@@ -3467,8 +3462,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,ScreenMapControllers,ScreenInputOptions,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenOtherOptions,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2"
+GroupedScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenMapControllers,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenOtherOptions,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2"
-PersistScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenMapControllers,ScreenInputOptions,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenOtherOptions,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2"
+PersistScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenMapControllers,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenOtherOptions,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2"
 
 [ScreenOptionsServiceChild]
 Fallback="ScreenOptionsMaster"