diff --git a/Output/Languages/Dutch.xml b/Output/Languages/Dutch.xml
index b05de898..0e9f88a9 100644
--- a/Output/Languages/Dutch.xml
+++ b/Output/Languages/Dutch.xml
@@ -217,7 +217,7 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcams</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webcam resolutie</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Beeldscherm aanpassingen</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Druk Ctrl+ Alt (+ Shift) + pijltjestoetsen|"+" om het scherm aan te passen.</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Druk Ctrl+ Alt (+ Shift) + pijltjestoetsen|\"+\" om het scherm aan te passen.</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">Ctrl + Alt + 0 om te herstellen</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Top links</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Top rechts</string>
diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml
index 5820b536..53dd928d 100644
--- a/Output/Languages/French.xml
+++ b/Output/Languages/French.xml
@@ -15,6 +15,7 @@
   <string name="TR_DEBUG_SONGS">Chansons chargées</string>
   <string name="TR_DEBUG_MOUSE">Souris</string>
   <string name="TR_DEBUG_MEMORY">Usage de la mémoire</string>
+  <string name="TR_GAMEMODE">Mode</string>
   <string name="TR_GAMEMODE_NORMAL">Normal</string>
   <string name="TR_GAMEMODE_DUET">Duo</string>
   <string name="TR_GAMEMODE_MEDLEY">Medley</string>
@@ -31,6 +32,10 @@
   <string name="TR_USERROLE_NORMAL">Utilisateur normal</string>
   <string name="TR_USERROLE_ADMIN">Administrateur</string>
   <string name="TR_USERROLE_KEYBOARDUSER">Clavier d'Utilisateur</string>
+  <string name="TR_SONGSOURCE">Source des chansons</string>
+  <string name="TR_SONGSOURCE_PLAYLIST">Playlist</string>
+  <string name="TR_SONGSOURCE_CATEGORY">Catégorie</string>
+  <string name="TR_SONGSOURCE_ALLSONGS">Toutes les chansons</string>
   <string name="TR_CONFIG_SOFTWARE">Logiciel</string>
   <string name="TR_CONFIG_OPENGL">OpenGL</string>
   <string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -151,6 +156,8 @@
   <string name="TR_SCREENSING_BUTTON_CANCEL">Arrêter de chanter</string>
   <string name="TR_SCREENSING_BUTTON_CONTINUE">Continuer</string>
   <string name="TR_SCREENSING_BUTTON_SKIP">Passer cette chanson</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_ROUND">Redémarer le tour</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_GAME">Redémarer le jeu</string>
   <string name="TR_SCREENSCORE_SCORES">Scores</string>
   <string name="TR_SCREENSCORE_RATING">Note</string>
   <string name="TR_SCREENSCORE_POINTS">Points</string>
@@ -183,6 +190,7 @@
   <string name="TR_SCREENOGAME_SONGMENU">Menu des Chansons</string>
   <string name="TR_SCREENOGAME_SONGSORTING">Classement des Chansons</string>
   <string name="TR_SCREENOGAME_TABS">Dossiers</string>
+  <string name="TR_SCREENOGAME_AUTOPLAYPREVIEWS">Démarrage automatique des aperçus</string>
   <string name="TR_SCREENOGAME_DIFFICULTY">Difficulté du Jeu</string>
   <string name="TR_SCREENOGAME_TIMERMODE">Mode du Minuteur</string>
   <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Style meilleur score</string>
diff --git a/Output/Languages/Italian.xml b/Output/Languages/Italian.xml
index 57fd6652..b375efa1 100644
--- a/Output/Languages/Italian.xml
+++ b/Output/Languages/Italian.xml
@@ -51,7 +51,7 @@
   <string name="TR_CONFIG_TILE_BOARD">Scacchiera</string>
   <string name="TR_CONFIG_BOOK">Libro</string>
   <string name="TR_CONFIG_COVERLOADING_ONDEMAND">Su richiesta</string>
-  <string name="TR_CONFIG_COVERLOADING_ATSTART">All'avvio</string>
+  <string name="TR_CONFIG_COVERLOADING_ATSTART">All\\'avvio</string>
   <string name="TR_CONFIG_COVERLOADING_DYNAMIC">Dinamico</string>
   <string name="TR_CONFIG_NONE">Nessuno</string>
   <string name="TR_CONFIG_RANDOM">Casuale</string>
@@ -119,10 +119,10 @@
   <string name="TR_SCREENNAMES_4PLAYER">4 giocatori</string>
   <string name="TR_SCREENNAMES_5PLAYER">5 giocatori</string>
   <string name="TR_SCREENNAMES_6PLAYER">6 giocatori</string>
-  <string name="TR_SCREENNAMES_WARNING_MICS_SG">Attenzione: Non c'è nessun microfono assegnato al giocatore %v!</string>
-  <string name="TR_SCREENNAMES_WARNING_MICS_PL">Attenzione: Non c'è nessun microfono assegnato ai giocatori %v!</string>
-  <string name="TR_SCREENNAMES_WARNING_PROFILES_SG">Attenzione: Non c'è nessun profilo assegnato al giocatore %v!</string>
-  <string name="TR_SCREENNAMES_WARNING_PROFILES_PL">Attenzione: Non c'è nessun profilo assegnato ai giocatori %v!</string>
+  <string name="TR_SCREENNAMES_WARNING_MICS_SG">Attenzione: Non c\'è nessun microfono assegnato al giocatore %v!</string>
+  <string name="TR_SCREENNAMES_WARNING_MICS_PL">Attenzione: Non c\'è nessun microfono assegnato ai giocatori %v!</string>
+  <string name="TR_SCREENNAMES_WARNING_PROFILES_SG">Attenzione: Non c\'è nessun profilo assegnato al giocatore %v!</string>
+  <string name="TR_SCREENNAMES_WARNING_PROFILES_PL">Attenzione: Non c\'è nessun profilo assegnato ai giocatori %v!</string>
   <string name="TR_SCREENSONG_MENU">Selezione canzone</string>
   <string name="TR_SCREENSONG_BUTTON_SING">Canta</string>
   <string name="TR_SCREENSONG_BUTTON_PLAYLIST">Aggiungi alla playlist</string>
@@ -223,7 +223,7 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcam</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Risoluzione-Webcam</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Sistemazione schermo</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Premi CTR + ALT (+ SHIFT) + Freccia|"+ per sistemare lo schermo</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Premi CTR + ALT (+ SHIFT) + Freccia|\"+\ per sistemare lo schermo</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + 0 per ripristinare</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Sopra a sinistra</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Sopra a destra</string>
diff --git a/Output/Languages/Portuguese.xml b/Output/Languages/Portuguese.xml
index b4b22541..e1551ac5 100644
--- a/Output/Languages/Portuguese.xml
+++ b/Output/Languages/Portuguese.xml
@@ -217,7 +217,7 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Camaras Web</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Resolução da Câmara Web</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Ajustes do Ecrã </string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Prima CTR + ALT (+ SHIFT) + Setas|"+" para ajustar o ecrã</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Prima CTR + ALT (+ SHIFT) + Setas|\"+\" para ajustar o ecrã</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + 0 para reiniciar</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Superior Esquerdo</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Superior Direito</string>
diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml
index 400027a8..39c859eb 100644
--- a/Output/Languages/Spanish.xml
+++ b/Output/Languages/Spanish.xml
@@ -225,7 +225,7 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Cámaras web</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Cámaras 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_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>
diff --git a/Output/PartyModes/Challenge/Languages/French.xml b/Output/PartyModes/Challenge/Languages/French.xml
index 27ece675..bf963c33 100644
--- a/Output/PartyModes/Challenge/Languages/French.xml
+++ b/Output/PartyModes/Challenge/Languages/French.xml
@@ -11,6 +11,7 @@
   <string name="TR_BUTTON_YES">Oui</string>
   <string name="TR_BUTTON_NO">Non</string>
   <string name="TR_BUTTON_NEXT_ROUND">Tour suivant</string>
+  <string name="TR_SONGS">Chansons</string>
   <string name="TR_SCREENCONFIG_TITLE">Mode Challenge: Configuration</string>
   <string name="TR_SCREENCONFIG_NUMPLAYERS">Nombre de joueurs</string>
   <string name="TR_SCREENCONFIG_NUMMICS">Nombre de micros</string>
diff --git a/Output/PartyModes/Challenge/Languages/German.xml b/Output/PartyModes/Challenge/Languages/German.xml
index 04f5648a..2afef0a3 100644
--- a/Output/PartyModes/Challenge/Languages/German.xml
+++ b/Output/PartyModes/Challenge/Languages/German.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="language">Deutsch</string>
   <string name="TR_PARTYMODE_NAME">Challenge Modus</string>
@@ -11,6 +11,7 @@
   <string name="TR_BUTTON_YES">Ja</string>
   <string name="TR_BUTTON_NO">Nein</string>
   <string name="TR_BUTTON_NEXT_ROUND">Nächste Runde</string>
+  <string name="TR_SONGS">Lieder</string>
   <string name="TR_SCREENCONFIG_TITLE">Challenge Modus: Einstellungen</string>
   <string name="TR_SCREENCONFIG_NUMPLAYERS">Anzahl der Spieler</string>
   <string name="TR_SCREENCONFIG_NUMMICS">Anzahl der Mikrofone</string>
diff --git a/Output/PartyModes/Challenge/Languages/Swedish.xml b/Output/PartyModes/Challenge/Languages/Swedish.xml
index f47c0fb6..3442c41f 100644
--- a/Output/PartyModes/Challenge/Languages/Swedish.xml
+++ b/Output/PartyModes/Challenge/Languages/Swedish.xml
@@ -11,6 +11,7 @@
   <string name="TR_BUTTON_YES">Ja</string>
   <string name="TR_BUTTON_NO">Nej</string>
   <string name="TR_BUTTON_NEXT_ROUND">Nästa omgång</string>
+  <string name="TR_SONGS">Låtar</string>
   <string name="TR_SCREENCONFIG_TITLE">Utmanarläge: Konfiguration</string>
   <string name="TR_SCREENCONFIG_NUMPLAYERS">Antal spelare</string>
   <string name="TR_SCREENCONFIG_NUMMICS">Antal mikrofoner</string>
diff --git a/Output/PartyModes/TicTacToe/Languages/French.xml b/Output/PartyModes/TicTacToe/Languages/French.xml
index eba0074d..d671f90b 100644
--- a/Output/PartyModes/TicTacToe/Languages/French.xml
+++ b/Output/PartyModes/TicTacToe/Languages/French.xml
@@ -2,7 +2,7 @@
 <resources>
   <string name="language">Français</string>
   <string name="TR_PARTYMODE_NAME">Tic-Tac-Toe</string>
-  <string name="TR_PARTYMODE_DESCRIPTION">Jouez au Tic-Tac-Toe d'une nouvelle façon</string>
+  <string name="TR_PARTYMODE_DESCRIPTION">Jouez au Tic-Tac-Toe d\'une nouvelle façon</string>
   <string name="TR_PARTYMODE_AUDIENCE">Des matchs amusants alliant stratégie, gains et compétences</string>
   <string name="TR_BUTTON_NEXT">Suivant</string>
   <string name="TR_BUTTON_BACK">Retour</string>
@@ -13,22 +13,19 @@
   <string name="TR_BUTTON_NEXT_ROUND">Démarrer</string>
   <string name="TR_SONGS">Chansons</string>
   <string name="TR_TEAM">Equipe</string>
-  <string name="TR_PLAYLIST">Playlist</string>
-  <string name="TR_CATEGORY">Catégorie</string>
-  <string name="TR_ALLSONGS">Toutes les chansons</string>
   <string name="TR_SCREENCONFIG_TITLE">Tic-Tac-Toe: Configuration</string>
-  <string name="TR_SCREENCONFIG_NUMPLAYERST1">Nombre de joueurs dans l'Equipe 1</string>
-  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Nombre de joueurs dans l'Equipe 2</string>
+  <string name="TR_SCREENCONFIG_NUMPLAYERST1">Nombre de joueurs dans l\'Equipe 1</string>
+  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Nombre de joueurs dans l\'Equipe 2</string>
   <string name="TR_SCREENCONFIG_NUMFIELDS">Nombre de champs</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Source des chansons</string>
-  <string name="TR_SCREENCONFIG_GAMEMODE">Mode de jeu</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Recharger les jokers a chaque tour</string>
   <string name="TR_SCREENNAMES_TITLE">Tic-Tac-Toe: Choix des joueurs</string>
   <string name="TR_SCREENNAMES_TEAM1">Equipe 1</string>
   <string name="TR_SCREENNAMES_TEAM2">Equipe 2</string>
+  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Sélectionner au hasard</string>
   <string name="TR_SCREENMAIN_TITLE">Tic-Tac-Toe</string>
   <string name="TR_SCREENMAIN_TEAM_CHOOSE">Choisissez une case.</string>
-  <string name="TR_SCREENMAIN_NEXT_PLAYER">Prochains joueurs</string>
-  <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Voulez vous vraiment quitter Tic-Tac-Toe?</string>
+  <string name="TR_SCREENMAIN_NEXT_PLAYER">Joueur suivant</string>
+  <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Voulez-vous vraiment quitter Tic-Tac-Toe?</string>
   <string name="TR_SCREENMAIN_WINNER">Et le gagnant est...</string>
-  <string name="TR_SCREENMAIN_NOWINNER">Il n'y a pas de gagnant sur ce tour...</string>
+  <string name="TR_SCREENMAIN_NOWINNER">Il n\'y a pas de gagnant sur ce tour...</string>
 </resources>
diff --git a/Output/PartyModes/TicTacToe/Languages/German.xml b/Output/PartyModes/TicTacToe/Languages/German.xml
index d6355997..8839754c 100644
--- a/Output/PartyModes/TicTacToe/Languages/German.xml
+++ b/Output/PartyModes/TicTacToe/Languages/German.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="language">Deutsch</string>
   <string name="TR_PARTYMODE_NAME">Tic-Tac-Toe</string>
@@ -13,15 +13,11 @@
   <string name="TR_BUTTON_NEXT_ROUND">Starten</string>
   <string name="TR_SONGS">Songs</string>
   <string name="TR_TEAM">Team</string>
-  <string name="TR_PLAYLIST">Playlist</string>
-  <string name="TR_CATEGORY">Kategorie</string>
-  <string name="TR_ALLSONGS">Alle Songs</string>
   <string name="TR_SCREENCONFIG_TITLE">Tic-Tac-Toe: Einstellungen</string>
   <string name="TR_SCREENCONFIG_NUMPLAYERST1">Anzahl der Spieler in Team 1</string>
   <string name="TR_SCREENCONFIG_NUMPLAYERST2">Anzahl der Spieler in Team 2</string>
   <string name="TR_SCREENCONFIG_NUMFIELDS">Anzahl der Felder</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Song-Quelle</string>
-  <string name="TR_SCREENCONFIG_GAMEMODE">Spiel-Modus</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Joker nach jeder Runde auffüllen</string>
   <string name="TR_SCREENNAMES_TITLE">Tic-Tac-Toe: Spielerwahl</string>
   <string name="TR_SCREENNAMES_TEAM1">Team 1</string>
   <string name="TR_SCREENNAMES_TEAM2">Team 2</string>
diff --git a/Output/PartyModes/TicTacToe/Languages/Swedish.xml b/Output/PartyModes/TicTacToe/Languages/Swedish.xml
index 259bbe71..cdde03a9 100644
--- a/Output/PartyModes/TicTacToe/Languages/Swedish.xml
+++ b/Output/PartyModes/TicTacToe/Languages/Swedish.xml
@@ -13,15 +13,11 @@
   <string name="TR_BUTTON_NEXT_ROUND">Starta</string>
   <string name="TR_SONGS">Låtar</string>
   <string name="TR_TEAM">Lag</string>
-  <string name="TR_PLAYLIST">Spellista</string>
-  <string name="TR_CATEGORY">Kategori</string>
-  <string name="TR_ALLSONGS">Alla låtar</string>
   <string name="TR_SCREENCONFIG_TITLE">Tripp-Trapp-Trull: Konfiguration</string>
   <string name="TR_SCREENCONFIG_NUMPLAYERST1">Antal spelare i lag 1</string>
   <string name="TR_SCREENCONFIG_NUMPLAYERST2">Antal spelare i lag 2</string>
   <string name="TR_SCREENCONFIG_NUMFIELDS">Antal fält</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Låtkälla</string>
-  <string name="TR_SCREENCONFIG_GAMEMODE">Spelläge</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Fyll på jokrar varje runda</string>
   <string name="TR_SCREENNAMES_TITLE">Tripp-Trapp-Trull: Välj spelare</string>
   <string name="TR_SCREENNAMES_TEAM1">Lag 1</string>
   <string name="TR_SCREENNAMES_TEAM2">Lag 2</string>