From b3b8a6ea2ecabbaa60c0517d70d82131b1f85e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Sat, 28 Feb 2015 14:09:33 +0100 Subject: [PATCH 1/4] Updated spanish translation. --- Output/Languages/Spanish.xml | 5 +++ .../ChallengeMedley/Languages/Spanish.xml | 44 +++++++++++-------- Vocaluxe/Website/locales/es.json | 6 +-- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml index 9d725abc..e91ed167 100644 --- a/Output/Languages/Spanish.xml +++ b/Output/Languages/Spanish.xml @@ -76,6 +76,7 @@ Canciones del juego y tema Vocaluxe Sin canciones del juego Solo canciones del juego + Sólo la canción seleccionada Todas Solo nombres y avatares Nada @@ -92,6 +93,7 @@ TODO: Party Opciones Perfiles + ¡No se encuentra perfil! TODO: Party Mode Selection TODO: Party Mode TODO: Description @@ -99,6 +101,7 @@ TODO: Version TODO: Can\'t load this party-mode. ¡No hay micrófonos configurados! + ¡Se necesitan %d micrófonos para este modo fiesta! TODO: Target audience TODO: No Teams TODO: Number of teams @@ -210,6 +213,8 @@ Cámaras web Resolución cámara web Ajustes de pantalla + Presione CTRL + ALT (+ SHIFT) + Flechas|\"+\" para ajustar la pantalla + CTRL + ALT + SHIFT + 0 para reiniciar Arriba izquierda Abajo derecha Abajo izquierda diff --git a/Output/PartyModes/ChallengeMedley/Languages/Spanish.xml b/Output/PartyModes/ChallengeMedley/Languages/Spanish.xml index 90c91f7e..aa15b634 100644 --- a/Output/PartyModes/ChallengeMedley/Languages/Spanish.xml +++ b/Output/PartyModes/ChallengeMedley/Languages/Spanish.xml @@ -1,30 +1,36 @@ Español - TODO: Challenge Medley Mode - TODO: Play some challenge rounds by using 5-some Medleys only. - TODO: For all who are interested in duel fights and Medleys. - TODO: Next + Modo Reto Popurrí + Jugar unas cuantas rondas de sólo Popurrí. + Para quienes estén interesados en dos cosas: duelos y Popurrí + Siguiente Volver Comenzar Salir Sí No - TODO: Next Round - TODO: Challenge Medley Mode: Configuration - TODO: Number of players - TODO: Number of mics - TODO: Number of rounds - TODO: Challenge Medley Mode: Choose Player + Siguiente Ronda + Lista de reproducción + Categoría + Todas las canciones + Canciones + Modo Reto Popurrí: Configuración + Número de jugadores + Número de micrófonos + Número de rondas + Número de canciones por ronda + Origen de las Canciones + Modo Reto Popurrí: Elegir Jugador Seleccionar aleatoriamente - TODO: Challenge Medley Mode: Overview + Modo Reto Popurrí: Resumen Posición - TODO: Name - TODO: Rounds - TODO: Wins - TODO: Sing Points - TODO: Score - TODO: Do you really want to exit? - TODO: Player of next round: - TODO: All rounds were sung! And the winner is... + Nombre + Rondas + Victorias + Puntos de Canto + Puntuación + ¿De verdad quiere salir? + Jugador de la siguiente ronda: + ¡Todas las rondas fueron cantadas! Y el ganador es... diff --git a/Vocaluxe/Website/locales/es.json b/Vocaluxe/Website/locales/es.json index 044e18fd..ff33aef1 100644 --- a/Vocaluxe/Website/locales/es.json +++ b/Vocaluxe/Website/locales/es.json @@ -80,7 +80,7 @@ "keyboardButtonShift": "Shift", "keyboardButtonAlt": "Alt", "keyboardButtonCtrl": "Control", - "keyboardButtonBackspace": "Backspace", - "keyboardAutoSend": "Auto send keys", - "keyboardButtonSend": "Send" + "keyboardButtonBackspace": "Retroceso", + "keyboardAutoSend": "Auto-enviar teclas.", + "keyboardButtonSend": "Mandar" } \ No newline at end of file From 58590c0db33882f5beaa990ed573462c7d88aa5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 2 Apr 2015 11:12:13 +0200 Subject: [PATCH 2/4] Fixed duet-bug. --- Vocaluxe/Screens/CScreenSing.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index febdde72..f0a2aae8 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -562,9 +562,6 @@ namespace Vocaluxe.Screens _Background = CDraw.AddTexture(Path.Combine(song.Folder, song.BackgroundFileNames[0])); } - _SingNotes[_SingBars].Init(CGame.NumPlayers); - - if (song.IsDuet) { //TODO: Show more than 2 voicenames @@ -579,11 +576,14 @@ namespace Vocaluxe.Screens } else { - for (int i = 0; i < CGame.NumPlayers; i++) - CGame.Players[i].VoiceNr = voiceAssignments[i]; + for (int i = 0; i < CGame.NumPlayers; i++) + CGame.Players [i].VoiceNr = voiceAssignments [i]; } } + //Attention: This needs to be done after player-assignment! + _SingNotes[_SingBars].Init(CGame.NumPlayers); + _DynamicLyricsTop = false; _DynamicLyricsBottom = false; From 48645d60d1db55d6b5d87b56746f4e40c98d8d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 2 Apr 2015 11:16:44 +0200 Subject: [PATCH 3/4] Fixed formatting (hopefully). --- Vocaluxe/Screens/CScreenSing.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index f0a2aae8..982865e6 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -576,13 +576,13 @@ namespace Vocaluxe.Screens } else { - for (int i = 0; i < CGame.NumPlayers; i++) - CGame.Players [i].VoiceNr = voiceAssignments [i]; + for (int i = 0; i < CGame.NumPlayers; i++) + CGame.Players [i].VoiceNr = voiceAssignments [i]; } } - //Attention: This needs to be done after player-assignment! - _SingNotes[_SingBars].Init(CGame.NumPlayers); + //Attention: This needs to be done after player-assignment! + _SingNotes[_SingBars].Init(CGame.NumPlayers); _DynamicLyricsTop = false; _DynamicLyricsBottom = false; From e717bb68f09ea08615778885a8a8ddb4849073ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 2 Apr 2015 12:24:14 +0200 Subject: [PATCH 4/4] Added extra statics and texts to ScreenSing that are only shown if player-num matches --- .../Themes/Changelog/Changelog_ScreenSing.txt | 2 ++ Vocaluxe/Screens/CScreenSing.cs | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/Output/Themes/Changelog/Changelog_ScreenSing.txt b/Output/Themes/Changelog/Changelog_ScreenSing.txt index 51b97fd8..dd1ef423 100644 --- a/Output/Themes/Changelog/Changelog_ScreenSing.txt +++ b/Output/Themes/Changelog/Changelog_ScreenSing.txt @@ -5,6 +5,8 @@ Version 7 Add: !text-position and size will be overwritten by vocaluxe! + Only shown if N$ matches Number of players + Only shown if N$ matches Number of players +++++++++ Version 6 diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 982865e6..829c69d1 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -859,6 +859,32 @@ namespace Vocaluxe.Screens _Texts[_TextDuetName1].Visible = false; _Texts[_TextDuetName2].Visible = false; + List staticsExtra = new List (); + List textsExtra = new List (); + + //Everything Static or Text with Extra should be only visible + //If Player-Number matches CGame.NumPlayers + foreach(CStatic st in _Statics) + if(st.GetThemeName().StartsWith("StaticExtra")) + staticsExtra.Add(st.GetThemeName()); + + foreach(CText tx in _Texts) + if(tx.GetThemeName().StartsWith("TextExtra")) + textsExtra.Add(tx.GetThemeName()); + + string curN = "N"+(CGame.NumPlayers); + foreach (string st in staticsExtra) + { + string n = st.Substring(st.Length - 2); + _Statics[st].Visible = n == curN; + } + + foreach (string tx in textsExtra) + { + string n = tx.Substring(tx.Length - 2); + _Texts[tx].Visible = n == curN; + } + for (int numplayer = 0; numplayer < CSettings.MaxNumPlayer; numplayer++) { for (int player = 0; player < CSettings.MaxNumPlayer && player <= numplayer; player++)