From a5d1bcec84d2cab4c64b0f68152cbd55e132b689 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 10 May 2008 00:46:43 +0000 Subject: [PATCH] merge OtherOptions into MachineOptions --- stepmania/Themes/default/Languages/de.ini | 5 ----- stepmania/Themes/default/Languages/en.ini | 5 ----- stepmania/Themes/default/Languages/es.ini | 5 ----- stepmania/Themes/default/Languages/fr.ini | 5 ----- stepmania/Themes/default/Languages/it.ini | 5 ----- stepmania/Themes/default/metrics.ini | 18 +++++++----------- 6 files changed, 7 insertions(+), 36 deletions(-) diff --git a/stepmania/Themes/default/Languages/de.ini b/stepmania/Themes/default/Languages/de.ini index 2360e46c15..b61fea385a 100644 --- a/stepmania/Themes/default/Languages/de.ini +++ b/stepmania/Themes/default/Languages/de.ini @@ -498,7 +498,6 @@ No Memory Card=Keine USB Speicherkarte gefunden. NoteSkins=Pfeilformen NumBackgrounds=Entscheidet über die maximale Anzahl zufällig ausgewählter Hintergründe, die gleichzeitig geladen werden. OnlyDedicatedMenuButtons=Die Standardeinstellung gestattet die Navigation durch die Menüs mit den Tanz-Pads. Wird sie auf &oq;nur zugeordnete&cq; geändert, ist die Navigation durch die Menüs auf die Menü* Tasten beschränkt. Achten Sie darauf, die Menü* Tasten zu belegen, bevor sie die &oq;nur zugeordnet&cq; Option einschalten! -Other Options=Ändern der Optionen Autogen und Laden. Persp=Persp PreloadSounds=Bei JA werden die meisten Lieder im voraus geladen. Dies erhöht die Ladezeit, und sollte normalerweise auf AUS bleiben. Premium=Premium @@ -923,7 +922,6 @@ NumBackgrounds=Zufällige\nHintergründe OnlyDedicatedMenuButtons=MenüButtons OsMountPlayer1=OS Aufstellen\nSpieler 1 OsMountPlayer2=OS Aufstellen\nSpieler 2 -Other Options=Andere Optionen Paste at begin marker=Am Anfang einfügen Paste at current beat=Am aktuellen Takt einfügen Persp=Persp @@ -1334,9 +1332,6 @@ Error mounting card: %s=Fehler beim Errichten der Karte: %s [ScreenOptionsService] HelpText=&UP; &DOWN; schaltet zwischen Zeilen um dann START drücken -[ScreenOtherOptions] -HelpText=&UP; &DOWN; schaltet zwischen Zeilen um &LEFT; &RIGHT; wählt Optionen an::START Änderungen annehmen ZURÜCK Änderungen verwerfen - [ScreenPackages] Download cancelled.=Download abgebrochen. Enter URL=URL eingeben diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index d388e134da..14df1d0e5c 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -354,7 +354,6 @@ OnlyDedicatedMenuButtons=The default setting allows the dance pad's panels to na OptionsRandomJukebox= OsMountPlayer1= OsMountPlayer2= -Other Options=Change autogen and loading options. Persp=Persp Player1Profile= Player2Profile= @@ -807,7 +806,6 @@ OptionsRandomJukebox=Modifiers OnlyDedicatedMenuButtons=Menu Buttons OsMountPlayer1=OS Mount Player1 OsMountPlayer2=OS Mount Player2 -Other Options=Other Options Paste at begin marker=Paste at begin marker Paste at current beat=Paste at current beat Persp=Persp @@ -1293,9 +1291,6 @@ HeaderText=Options HeaderSubText=You can configure the game here HelpText=&UP; &DOWN; to change line then press START -[ScreenOtherOptions] -HelpText=&UP; &DOWN; to change line &LEFT; &RIGHT; to select between options::START to accept changes BACK to discard changes - [ScreenPackages] Download cancelled.=Download cancelled. Enter URL=Enter URL diff --git a/stepmania/Themes/default/Languages/es.ini b/stepmania/Themes/default/Languages/es.ini index 540fdb44a3..6648f98f30 100644 --- a/stepmania/Themes/default/Languages/es.ini +++ b/stepmania/Themes/default/Languages/es.ini @@ -497,7 +497,6 @@ No Memory Card=No se encontro ninguna tarjeta de memoria USB. NoteSkins=Skins de notas NumBackgrounds=Escoger el número maximo de fondos al azar para poder cargarlos simultáneamente. OnlyDedicatedMenuButtons=El ajuste por defecto permite que en los paneles de la pista de baile se pueda navegar por los menús. Si cambias esto a &oq;dedicado únicamente&cq; restringirá la navegación por el menú a solamente la secuencia de botones del Menú. Asegúrate de mapear la secuencia de botones del Menú antes de que ajustes a &oq;dedicado&cq; -Other Options=Cambiar el autogen y las opciones de carga. Persp=Perspectiva PreloadSounds=Si pulsas SI, se cargan por anticipado la mayor parte de los sonidos. esto incrementa la velocidad de carga, aunque se recomienda que esté DESACTIVADO. Premium=Premium @@ -882,7 +881,6 @@ NumBackgrounds=Fondos\nal azar OnlyDedicatedMenuButtons=Botones del menú OsMountPlayer1=Soporte OS\njugador 1 OsMountPlayer2=Soporte OS\njugador 2 -Other Options=Otras Opciones Paste at begin marker=Pegar en el marcador de inicio Paste at current beat=Pegar en el ritmo actual Persp=Perspectiva @@ -1293,9 +1291,6 @@ Error mounting card: %s=Error al montar la tarjeta: %s [ScreenOptionsService] HelpText=&UP; &DOWN; para cambiar línea; a continuación presione START -[ScreenOtherOptions] -HelpText=&UP; &DOWN; para cambiar línea. &LEFT; &RIGHT; para seleccionar opciones::START para aceptar cambios. HACIA ATRÁS para deshacer cambios. - [ScreenPackages] Download cancelled.=Descarga cancelada. Enter URL=Introducir URL diff --git a/stepmania/Themes/default/Languages/fr.ini b/stepmania/Themes/default/Languages/fr.ini index cef2f9e5b3..c7c10fb6bd 100644 --- a/stepmania/Themes/default/Languages/fr.ini +++ b/stepmania/Themes/default/Languages/fr.ini @@ -475,7 +475,6 @@ No Memory Card=Aucune carte mémoire USB n'a été trouvée. NoteSkins=ApparencesDesNotes NumBackgrounds=Choisissez le nombre maximum d'arrière-plans aléatoires à charger simultanément. OnlyDedicatedMenuButtons=Le paramètre par défaut permet de naviguer dans les menus à l'aide du tapis de danse. Le changer en &oq;DEDIE&cq; limitera la navigation dans les menus aux boutons Menu*. Vous devez configurer les boutons de Menu* avant de passer en &oq;DEDIE&cq;! -Other Options=Changer les options d'auto génération et les options de chargement. Persp=Persp PreloadSounds=Si OUI, précharge la plupart des sons au préalable. Ceci augmente les temps de chargement, et devrait normalement rester en position OFF. Premium=Prime @@ -900,7 +899,6 @@ NumBackgrounds=Arrière-plans\nAléatoires OnlyDedicatedMenuButtons=BoutonsMenu OsMountPlayer1=Montage OS\nJoueur 1 OsMountPlayer2=Montage OS\nJoueur 2 -Other Options=Autres options Paste at begin marker=Coller au marqueur de départ Paste at current beat=Coller au rythme actuel Persp=Persp @@ -1312,9 +1310,6 @@ Error mounting card: %s=Erreur montage carte: %s [ScreenOptionsService] HelpText=&UP; &DOWN; pour changer de ligne, puis appuyez sur DEMARRER -[ScreenOtherOptions] -HelpText=&UP; &DOWN; pour changer de ligne &LEFT; &RIGHT; pour sélectionner les options::DEMARRER pour accepter les changements RETOUR pour annuler les changements - [ScreenPackages] Download cancelled.=Téléchargement annulé. Enter URL=Entrez adresse URL. diff --git a/stepmania/Themes/default/Languages/it.ini b/stepmania/Themes/default/Languages/it.ini index 975418903f..d5143a5bc7 100644 --- a/stepmania/Themes/default/Languages/it.ini +++ b/stepmania/Themes/default/Languages/it.ini @@ -470,7 +470,6 @@ No Memory Card=Non sono state trovate schede di memoria USB. NoteSkins=NoteSkins NumBackgrounds=Scegli il numero massimo di sfondi a caso caricabili simultaneamente. OnlyDedicatedMenuButtons=L'impostazione di default permette ai pannelli della pedana di ballo di navigare tra i menù. Modificandola in &oq;dedicated only&cq; la navigazione tra i menu viene limitata alla serie di bottoni Menù*. Assicuratevi di effettuare la mappatura della serie di bottoni Menù* prima di modificare l'impostazione in &oq;dedicated&cq;! -Other Options=Cambia le opzioni d autogenerazione e di caricamento. Persp=Persp PreloadSounds=Se SI' carica in anticipo la maggior parte dei suoni. Ciò aumenta i tempi di caricamento e normalmente dovrebbe essere lasciato SPENTO. Premium=Premio @@ -895,7 +894,6 @@ NumBackgrounds=Sfondi\na caso OnlyDedicatedMenuButtons=Bottoni menù OsMountPlayer1=OS Mount\nPlayer1 OsMountPlayer2=OS Mount\nPlayer2 -Other Options=Altre opzioni Paste at begin marker=Incolla al segno di inizio Paste at current beat=Incolla a questo ritmo Persp=Persp @@ -1306,9 +1304,6 @@ Error mounting card: %s=Errore nel montaggio della scheda: %s [ScreenOptionsService] HelpText=&UP; &DOWN; per cambiare linea poi premi AVVIA -[ScreenOtherOptions] -HelpText=&UP; &DOWN; per cambiare linea &LEFT; &RIGHT; per selezionare le opzioni::AVVIA per accettare le modifiche INDIETRO per rifiutare le modifiche - [ScreenPackages] Download cancelled.=Download cancellato. Enter URL=Inserisci URL diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index e593aa2015..bc77dc0542 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2914,7 +2914,7 @@ IdleTimeoutSeconds=0 [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,22,23,24,25,26,27" +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,28,29,30" Line1="conf,MenuTimer" Line2="conf,ScoringType" Line3="conf,TimingWindowScale" @@ -2942,6 +2942,9 @@ Line24="conf,AutoPlay" Line25="conf,DelayedBack" Line26="conf,ArcadeOptionsNavigation" Line27="conf,MusicWheelSwitchSpeed" +Line28="conf,AutogenSteps" +Line29="conf,AutogenGroupCourses" +Line30="conf,FastLoad" [ScreenGraphicOptions] Fallback="ScreenOptionsServiceChild" @@ -2986,12 +2989,6 @@ Line17="conf,ShowDancingCharacters" Line18="conf,ShowBeginnerHelper" Line19="conf,NumBackgrounds" -[ScreenOtherOptions] -Fallback="ScreenOptionsServiceChild" -LineNames="1,2,3" -Line1="conf,AutogenSteps" -Line2="conf,AutogenGroupCourses" -Line3="conf,FastLoad" [ScreenAttract] ResetGameState=true @@ -3449,21 +3446,20 @@ ShowStyleIcon=false TimerSeconds=-1 AllowOperatorMenuButton=false -LineNames="1,5,8,9,11,12,13,14,15,16,17" +LineNames="1,5,8,9,11,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" Line8="gamecommand;screen,ScreenGraphicOptions;name,Graphic Options" Line9="gamecommand;screen,ScreenMachineOptions;name,Machine Options" Line11="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles" -Line12="gamecommand;screen,ScreenOtherOptions;name,Other Options" Line13="gamecommand;screen,ScreenNetworkOptions;name,Network Options" 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,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenOtherOptions,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2" -PersistScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenMapControllers,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenOtherOptions,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2" +GroupedScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenMapControllers,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2" +PersistScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenMapControllers,ScreenGraphicOptions,ScreenMachineOptions,ScreenOptionsManageProfiles,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenCredits2" [ScreenOptionsServiceChild] Fallback="ScreenOptionsMaster"