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 @@
   <string name="TR_CONFIG_OWN_MUSIC">Canciones del juego y tema Vocaluxe</string>
   <string name="TR_CONFIG_NO_OWN_MUSIC">Sin canciones del juego</string>
   <string name="TR_CONFIG_ONLY_OWN_MUSIC">Solo canciones del juego</string>
+  <string name="TR_CONFIG_ONLY_SONG">Sólo la canción seleccionada</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_ALL">Todas</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Solo nombres y avatares</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Nada</string>
@@ -92,6 +93,7 @@
   <string name="TR_SCREENMAIN_BUTTON_PARTY">TODO: Party</string>
   <string name="TR_SCREENMAIN_BUTTON_OPTIONS">Opciones</string>
   <string name="TR_SCREENMAIN_BUTTON_PROFILES">Perfiles</string>
+  <string name="TR_SCREENMAIN_TEXT_NOPROFILES">¡No se encuentra perfil!</string>
   <string name="TR_SCREENPARTY_TITLE">TODO: Party Mode Selection</string>
   <string name="TR_SCREENPARTY_MODES">TODO: Party Mode</string>
   <string name="TR_SCREENPARTY_DESCRIPTION">TODO: Description</string>
@@ -99,6 +101,7 @@
   <string name="TR_SCREENPARTY_VERSION">TODO: Version</string>
   <string name="TR_SCREENPARTY_ERROR">TODO: Can\'t load this party-mode.</string>
   <string name="TR_SCREENPARTY_ERROR_MICS">¡No hay micrófonos configurados!</string>
+  <string name="TR_SCREENPARTY_ERROR_MIC_NUM">¡Se necesitan %d micrófonos para este modo fiesta!</string>
   <string name="TR_SCREENPARTY_TARGETAUDIENCE">TODO: Target audience</string>
   <string name="TR_SCREENPARTY_NOTEAMS">TODO: No Teams</string>
   <string name="TR_SCREENPARTY_NUMTEAMS">TODO: Number of teams</string>
@@ -210,6 +213,8 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Cámaras web</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Resolución cámara web</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Ajustes de pantalla</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Presione CTRL + ALT (+ SHIFT) + Flechas|\"+\" para ajustar la pantalla</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTRL + ALT + SHIFT + 0 para reiniciar</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Arriba izquierda</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Abajo derecha</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Abajo izquierda</string>
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 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="language">Español</string>
-  <string name="TR_PARTYMODE_NAME">TODO: Challenge Medley Mode</string>
-  <string name="TR_PARTYMODE_DESCRIPTION">TODO: Play some challenge rounds by using 5-some Medleys only.</string>
-  <string name="TR_PARTYMODE_AUDIENCE">TODO: For all who are interested in duel fights and Medleys.</string>
-  <string name="TR_BUTTON_NEXT">TODO: Next</string>
+  <string name="TR_PARTYMODE_NAME">Modo Reto Popurrí</string>
+  <string name="TR_PARTYMODE_DESCRIPTION">Jugar unas cuantas rondas de sólo Popurrí.</string>
+  <string name="TR_PARTYMODE_AUDIENCE">Para quienes estén interesados en dos cosas: duelos y Popurrí</string>
+  <string name="TR_BUTTON_NEXT">Siguiente</string>
   <string name="TR_BUTTON_BACK">Volver</string>
   <string name="TR_BUTTON_START">Comenzar</string>
   <string name="TR_BUTTON_EXIT">Salir</string>
   <string name="TR_BUTTON_YES">Sí</string>
   <string name="TR_BUTTON_NO">No</string>
-  <string name="TR_BUTTON_NEXT_ROUND">TODO: Next Round</string>
-  <string name="TR_SCREENCONFIG_TITLE">TODO: Challenge Medley Mode: Configuration</string>
-  <string name="TR_SCREENCONFIG_NUMPLAYERS">TODO: Number of players</string>
-  <string name="TR_SCREENCONFIG_NUMMICS">TODO: Number of mics</string>
-  <string name="TR_SCREENCONFIG_NUMROUNDS">TODO: Number of rounds</string>
-  <string name="TR_SCREENNAMES_TITLE">TODO: Challenge Medley Mode: Choose Player</string>
+  <string name="TR_BUTTON_NEXT_ROUND">Siguiente Ronda</string>
+  <string name="TR_PLAYLIST">Lista de reproducción</string>
+  <string name="TR_CATEGORY">Categoría</string>
+  <string name="TR_ALLSONGS">Todas las canciones</string>
+  <string name="TR_SONGS">Canciones</string>
+  <string name="TR_SCREENCONFIG_TITLE">Modo Reto Popurrí: Configuración</string>
+  <string name="TR_SCREENCONFIG_NUMPLAYERS">Número de jugadores</string>
+  <string name="TR_SCREENCONFIG_NUMMICS">Número de micrófonos</string>
+  <string name="TR_SCREENCONFIG_NUMROUNDS">Número de rondas</string>
+  <string name="TR_SCREENCONFIG_NUMSONGS">Número de canciones por ronda</string>
+  <string name="TR_SCREENCONFIG_SONGSOURCE">Origen de las Canciones</string>
+  <string name="TR_SCREENNAMES_TITLE">Modo Reto Popurrí: Elegir Jugador</string>
   <string name="TR_SCREENNAMES_BUTTON_RANDOM">Seleccionar aleatoriamente</string>
-  <string name="TR_SCREENMAIN_TITLE">TODO: Challenge Medley Mode: Overview</string>
+  <string name="TR_SCREENMAIN_TITLE">Modo Reto Popurrí: Resumen</string>
   <string name="TR_SCREENMAIN_TABLE_POS">Posición</string>
-  <string name="TR_SCREENMAIN_TABLE_PLAYERNAME">TODO: Name</string>
-  <string name="TR_SCREENMAIN_TABLE_NUMPLAYED">TODO: Rounds</string>
-  <string name="TR_SCREENMAIN_TABLE_WON">TODO: Wins</string>
-  <string name="TR_SCREENMAIN_TABLE_SINGPOINTS">TODO: Sing Points</string>
-  <string name="TR_SCREENMAIN_TABLE_GAMEPOINTS">TODO: Score</string>
-  <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">TODO: Do you really want to exit?</string>
-  <string name="TR_SCREENMAIN_NEXT_PLAYER">TODO: Player of next round:</string>
-  <string name="TR_SCREENMAIN_FINISH">TODO: All rounds were sung! And the winner is...</string>
+  <string name="TR_SCREENMAIN_TABLE_PLAYERNAME">Nombre</string>
+  <string name="TR_SCREENMAIN_TABLE_NUMPLAYED">Rondas</string>
+  <string name="TR_SCREENMAIN_TABLE_WON">Victorias</string>
+  <string name="TR_SCREENMAIN_TABLE_SINGPOINTS">Puntos de Canto</string>
+  <string name="TR_SCREENMAIN_TABLE_GAMEPOINTS">Puntuación</string>
+  <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">¿De verdad quiere salir?</string>
+  <string name="TR_SCREENMAIN_NEXT_PLAYER">Jugador de la siguiente ronda:</string>
+  <string name="TR_SCREENMAIN_FINISH">¡Todas las rondas fueron cantadas! Y el ganador es...</string>
 </resources>
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