Merge branch 'develop' into vocaluxe-2024-design-marwin89

2023-12-31 13:53:41 +01:00
commit d3a85dc528
@@ -15,6 +15,7 @@
  <string name="TR_DEBUG_SONGS">Nahrané písně</string>
  <string name="TR_DEBUG_MOUSE">Myš</string>
  <string name="TR_DEBUG_MEMORY">Využití paměti</string>
+  <string name="TR_GAMEMODE">Herní režim</string>
  <string name="TR_GAMEMODE_NORMAL">Normální</string>
  <string name="TR_GAMEMODE_DUET">Duet</string>
  <string name="TR_GAMEMODE_MEDLEY">Směska</string>
@@ -31,6 +32,10 @@
  <string name="TR_USERROLE_NORMAL">Normální uživatel</string>
  <string name="TR_USERROLE_ADMIN">Správce</string>
  <string name="TR_USERROLE_KEYBOARDUSER">Uživatel klávesnice</string>
+  <string name="TR_SONGSOURCE">Zdroj písně</string>
+  <string name="TR_SONGSOURCE_PLAYLIST">Seznam skladeb</string>
+  <string name="TR_SONGSOURCE_CATEGORY">Skupina</string>
+  <string name="TR_SONGSOURCE_ALLSONGS">Všechny písně</string>  
  <string name="TR_CONFIG_SOFTWARE">Software</string>
  <string name="TR_CONFIG_OPENGL">OpenGL</string>
  <string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -147,10 +152,21 @@
  <string name="TR_SCREENSONG_NUMSONGS">(%v písní)</string>
  <string name="TR_SCREENSONG_NUMSONG">(%v píseň)</string>
  <string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
+  <string name="TR_SCREENSONG_HELPMESSAGE">A-Z = Skok na písmeno • F3 = Vyhledávat • CTRL+R = Náhodný výběr - CTRL+S = Spustit směsku • CTRL+# = Změnit řazení skladeb • CTRL+T = Zapnout/Vypnout zobrazení kategorií • Mezerník = Otevřít volby skladby • ESC = Zpět do hlavní nabídky</string>
+  <string name="TR_SCREENSONG_HELPMESSAGESEARCH">A-Z = Vyhledávání umělce a názvu, předpony pro vyhledávání → a: = umělec • t: = název • c: = tvůrce • e: = edice • g: = žánr • y: = rok (např. 1999 nebo 1980-1989) • l: = jazyk • al: = album • fi: = název souboru • fo: = název složky</string>
+  <string name="TR_SCREENSONG_HELPMESSAGEPARTY">1-6 = stisknutím čísla týmu použijete náhodný žolík.</string>
+  <string name="TR_SCREENSONG_SORTING">Řazení: %s</string>
+  <string name="TR_SCREENSONG_NOMEDLEY">Žádnou směsku pro tuto píseň!</string>
  <string name="TR_SCREENSING_PAUSE">Pozastavit</string>
  <string name="TR_SCREENSING_BUTTON_CANCEL">Zastavit zpívání</string>
  <string name="TR_SCREENSING_BUTTON_CONTINUE">Pokračovat</string>
  <string name="TR_SCREENSING_BUTTON_SKIP">Přeskočit tuto píseň</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_ROUND">Začít kolo znovu</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_GAME">Začít hru znovu</string>
+  <string name="TR_SCREENSING_NOMORESONGS">Žádné další písně v seznamu skladeb!</string>
+  <string name="TR_SCREENSING_NOWEBCAM">Webová kamera není dostupná!</string>
+  <string name="TR_SCREENSING_ASPECTRATIO">Poměr stran: %a</string>
+  <string name="TR_SCREENSING_SKIPPEDSECONDS">Přeskočeno %s sekund</string>
  <string name="TR_SCREENSCORE_SCORES">Výsledky</string>
  <string name="TR_SCREENSCORE_RATING">Hodnocení</string>
  <string name="TR_SCREENSCORE_POINTS">Body</string>
@@ -183,6 +199,7 @@
  <string name="TR_SCREENOGAME_SONGMENU">Nabídka písně</string>
  <string name="TR_SCREENOGAME_SONGSORTING">Třídění písně</string>
  <string name="TR_SCREENOGAME_TABS">Karty</string>
+  <string name="TR_SCREENOGAME_AUTOPLAYPREVIEWS">Přehrávat automaticky náhledy písní</string>
  <string name="TR_SCREENOGAME_DIFFICULTY">Obtížnost hry</string>
  <string name="TR_SCREENOGAME_TIMERMODE">Režim časomíry</string>
  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Styl  pro nejlepší výsledky</string>
@@ -234,4 +251,19 @@
  <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Hlasitost</string>
  <string name="TR_SCREENPSERVERQR_ADDRESS">Adresa serveru</string>
  <string name="TR_SCREENPSERVERQR_NOTRUNNING">Server neběží. Prověřte, prosím, config.xml!</string>
+  <string name="TR_REPORTER_TITLE_TEXT">Promiňte</string>
+  <string name="TR_REPORTER_MESSAGE_CRASH_TEXT">Vocaluxe postihla chyba a spadl.\r\nPomožte nám opravit problém, pošlete hlášení.\r\nPro odstranění možná citlivých údajů před odesláním upravte následující zápis.</string>
+  <string name="TR_REPORTER_MESSAGE_NO_CRASH_TEXT">, že jste zažili chybu.\r\nPomožte nám opravit problém, pošlete hlášení.\r\nPro odstranění možná citlivých údajů před odesláním upravte následující zápis.</string>
+  <string name="TR_REPORTER_NO_UPLOAD_TEXT">Nenahrávejte nic (můžete pořád zkopírovat hlášení o chybě výše)</string>
+  <string name="TR_REPORTER_GIST_AND_ISSUE_TEXT">Nahrajte a otevřete téma (veřejně viditelné + vyžaduje účet na Githubu)</string>
+  <string name="TR_REPORTER_GIST_ONLY_TEXT">Nahrajte a získejte odkaz na svoji zprávu (veřejně viditelné)</string>
+  <string name="TR_REPORTER_SUBMIT_STEP0_TEXT">Odeslat</string>
+  <string name="TR_REPORTER_SUBMIT_STEP1_TEXT">Nahrává se</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_EXIT_TEXT">Ukončit</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_CONTINUE_TEXT">Pokračovat</string>
+  <string name="TR_REPORTER_SUBMITED_MESSAGE_TEXT">Odkaz na vaše hlášení:</string>
+  <string name="TR_REPORTER_LOGUPLOAD_ERROR_TEXT">Chyba při nahrávání zápisu.</string>
+  <string name="TR_REPORTER_LAST_ERROR_TITLE_TEXT">Poslední chyba</string>
+  <string name="TR_REPORTER_LAST_ERROR_NA">Nedostupné</string>
+  <string name="TR_REPORTER_ISSUE_TEMPLATE">Zde popište potíže.\n\n### Kroky k zopakování situace\nŘekněte nám, jak zopakovat tento problém.\n\n### Verze Vocaluxe a soubor se záznamem\n{0}\n{1}</string>
 </resources>
@@ -15,6 +15,7 @@
  <string name="TR_DEBUG_SONGS">Geladene Songs</string>
  <string name="TR_DEBUG_MOUSE">Maus</string>
  <string name="TR_DEBUG_MEMORY">Speicherverbrauch</string>
+  <string name="TR_GAMEMODE">Spielmodus</string>
  <string name="TR_GAMEMODE_NORMAL">Normal</string>
  <string name="TR_GAMEMODE_DUET">Duett</string>
  <string name="TR_GAMEMODE_MEDLEY">Medley</string>
@@ -31,6 +32,10 @@
  <string name="TR_USERROLE_NORMAL">Normaler Benutzer</string>
  <string name="TR_USERROLE_ADMIN">Administrator</string>
  <string name="TR_USERROLE_KEYBOARDUSER">Tastatur Benutzer</string>
+  <string name="TR_SONGSOURCE">Song-Quelle</string>
+  <string name="TR_SONGSOURCE_PLAYLIST">Playlist</string>
+  <string name="TR_SONGSOURCE_CATEGORY">Kategorie</string>
+  <string name="TR_SONGSOURCE_ALLSONGS">Alle Lieder</string>  
  <string name="TR_CONFIG_SOFTWARE">Software</string>
  <string name="TR_CONFIG_OPENGL">OpenGL</string>
  <string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -147,19 +152,21 @@
  <string name="TR_SCREENSONG_NUMSONGS">(%v Lieder)</string>
  <string name="TR_SCREENSONG_NUMSONG">(%v Lied)</string>
  <string name="TR_SCREENSONG_ARTIST_TITLE">%a -%t</string>
-  <string name="TR_SCREENSONG_HELPMESSAGE">A-Z = Zum Buchstaben springen • F3 = Suchen • STRG+R = Zufällige Auswahl • STRG+S = Starte Medley • STRG+# = Song Sortierung ändern • STRG+T = Kategorieansicht ein-/ausschalten • Leertaste = Lied-Optionen öffnen • ESC = Zurück zum Hauptmenü</string>
-  <string name="TR_SCREENSONG_HELPMESSAGESEARCH">A-Z = Interpreten und Titel durchsuchen, Präfixe für die Suche → a: = Interpret • t: = Titel • c: = Ersteller • e: = Edition • g: = Genre • y: = Jahr (z.B. 1999 oder 1980-1989) • l: = Sprache • al: = Album • fi: = Dateiname • fo: = Ordnername</string>
-  <string name="TR_SCREENSONG_HELPMESSAGEPARTY">1-6 = Drücke die Teamnummer um einen Zufallssong Joker zu verwenden</string>
+  <string name="TR_SCREENSONG_HELPMESSAGE">A-Z = Zum Buchstaben springen • F3 = Suchen • STRG+R = Zufällige Auswahl • STRG+S = Medley starten • STRG+# = Song-Reihenfolge ändern • STRG+T = Kategorieansicht an-/abschalten • Leertaste = Songoptionen öffnen • ESC = Zurück zum Hauptmenü</string>
+  <string name="TR_SCREENSONG_HELPMESSAGESEARCH">A-Z = Interpret und Titel suchen; Präfixe für die Suche → a: = Interpret • t: = Titel • c: = Autor • e: = Edition • g: = Genre • y: = Jahr (z.B. 1999 oder 1980-1989) • l: = Sprache • al: = Album • fi: = Dateiname • fo: = Ordnername</string>
+  <string name="TR_SCREENSONG_HELPMESSAGEPARTY">1-6 = Drücke die Nummer Deines Teams, um einen zufälligen Song-Joker einzusetzen</string>
  <string name="TR_SCREENSONG_SORTING">Sortierung: %s</string>
  <string name="TR_SCREENSONG_NOMEDLEY">Kein Medley für diesen Song!</string>
  <string name="TR_SCREENSING_PAUSE">Pause</string>
  <string name="TR_SCREENSING_BUTTON_CANCEL">Lied beenden</string>
  <string name="TR_SCREENSING_BUTTON_CONTINUE">Fortfahren</string>
  <string name="TR_SCREENSING_BUTTON_SKIP">Lied überspringen</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_ROUND">Runde neustarten</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_GAME">Spiel neustarten</string>
  <string name="TR_SCREENSING_NOMORESONGS">Keine weiteren Songs in der Playlist!</string>
  <string name="TR_SCREENSING_NOWEBCAM">Keine Webcam verfügbar!</string>
-  <string name="TR_SCREENSING_ASPECTRATIO">Seitenverhältnis: %a</string>
-  <string name="TR_SCREENSING_SKIPPEDSECONDS">%s Sekunden gesprungen</string>
+  <string name="TR_SCREENSING_ASPECTRATIO">Bildverhältnis: %a</string>
+  <string name="TR_SCREENSING_SKIPPEDSECONDS">%s Sekunden übersprungen</string>
  <string name="TR_SCREENSCORE_SCORES">Auswertung</string>
  <string name="TR_SCREENSCORE_RATING">Bewertung</string>
  <string name="TR_SCREENSCORE_POINTS">Punkte</string>
@@ -192,6 +199,7 @@
  <string name="TR_SCREENOGAME_SONGMENU">Song-Menu-Stil</string>
  <string name="TR_SCREENOGAME_SONGSORTING">Sortierung der Lieder</string>
  <string name="TR_SCREENOGAME_TABS">Kategorieren anzeigen</string>
+  <string name="TR_SCREENOGAME_AUTOPLAYPREVIEWS">Autoplay für Songvorschau</string>
  <string name="TR_SCREENOGAME_DIFFICULTY">Schwierigkeit</string>
  <string name="TR_SCREENOGAME_TIMERMODE">Zeit-Modus</string>
  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Highscore-Stil</string>
@@ -243,4 +251,19 @@
  <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Lautstärke</string>
  <string name="TR_SCREENPSERVERQR_ADDRESS">Serveradresse</string>
  <string name="TR_SCREENPSERVERQR_NOTRUNNING">Server läuft derzeit nicht. Bitte überprüfe die config.xml!</string>
+  <string name="TR_REPORTER_TITLE_TEXT">Es tut uns leid</string>
+  <string name="TR_REPORTER_MESSAGE_CRASH_TEXT">dass Vocaluxe abgestürzt ist.\r\nUm uns zu helfen, das Problem zu beheben, schicke uns bitte einen Absturzbericht.\r\nBitte bearbeite das folgende Protokoll, so dass keine eventuell persönlichen Daten enthalten sind.</string>
+  <string name="TR_REPORTER_MESSAGE_NO_CRASH_TEXT">dass Du einen Fehler festgestellt hast.\r\nUm uns zu helfen, das Problem zu beheben, schicke uns bitte einen Absturzbericht.\r\nBitte bearbeite das folgende Protokoll, so dass keine eventuell persönlichen Daten enthalten sind.</string>
+  <string name="TR_REPORTER_NO_UPLOAD_TEXT">Nichts hochladen (Du kannst immer noch die Fehlermeldung oben kopieren)</string>
+  <string name="TR_REPORTER_GIST_AND_ISSUE_TEXT">Hochladen und ein Ticket eröffnen (öffentlich sichtbar und benötigt einen github-Account)</string>
+  <string name="TR_REPORTER_GIST_ONLY_TEXT">Hochladen und einen Link zum Bericht erhalten (öffentlich sichtbar)</string>
+  <string name="TR_REPORTER_SUBMIT_STEP0_TEXT">Senden</string>
+  <string name="TR_REPORTER_SUBMIT_STEP1_TEXT">Lade hoch</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_EXIT_TEXT">Verlassen</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_CONTINUE_TEXT">Fortfahren</string>
+  <string name="TR_REPORTER_SUBMITED_MESSAGE_TEXT">Der Link zu Deinem Bericht:</string>
+  <string name="TR_REPORTER_LOGUPLOAD_ERROR_TEXT">Fehler beim Hochladen des Protokolls.</string>
+  <string name="TR_REPORTER_LAST_ERROR_TITLE_TEXT">Letzter Fehler</string>
+  <string name="TR_REPORTER_LAST_ERROR_NA">Nicht verfügbar</string>
+  <string name="TR_REPORTER_ISSUE_TEMPLATE">Beschreibe Dein Problem hier.\n\n###Schritte zum Reproduzieren des Problems\nTeil uns mit wie man das Problem reproduzieren kann.\n\n###Vocaluxe-Version und -Protokoll\n{0}\n{1}</string>
 </resources>
@@ -35,7 +35,7 @@
  <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_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>
@@ -145,19 +145,28 @@
  <string name="TR_SCREENSONG_SONGOPTIONS">Options de la chanson</string>
  <string name="TR_SCREENSONG_SEARCH">Rechercher:</string>
  <string name="TR_SCREENSONG_NOLANGUAGE">Pas de Langue</string>
-  <string name="TR_SCREENSONG_NOYEAR">Pas d'Année</string>
+  <string name="TR_SCREENSONG_NOYEAR">Pas d\'Année</string>
  <string name="TR_SCREENSONG_NOGENRE">Pas de Genre</string>
-  <string name="TR_SCREENSONG_NOEDITION">Pas d'Edition</string>
+  <string name="TR_SCREENSONG_NOEDITION">Pas d\'Edition</string>
  <string name="TR_SCREENSONG_ALLSONGS">Toutes les chansons</string>
  <string name="TR_SCREENSONG_NUMSONGS">(%v Chansons)</string>
  <string name="TR_SCREENSONG_NUMSONG">(%v Chanson)</string>
  <string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
+  <string name="TR_SCREENSONG_HELPMESSAGE">A-Z = Sauter à la lettre • F3 = Chercher • CTRL+R = Sélectionner au hasard • CTRL+S = Lancer medley • CTRL+# = Changer le tri des chansons • CTRL+T = Activer/Désactiver la vue par catégorie • Espace = Ouvrir les options de chanson • Échap = Retouner au menu précédent</string>
+  <string name="TR_SCREENSONG_HELPMESSAGESEARCH">A-Z = Chercher artiste et titre, préfixes pour la recherche → a: = artiste • t: = titre • c: = créateurr • e: = édition • g: = genre • y: = année (ex: 1999 ou 1980-1989) • l: = langage • al: = album • fi: = nom du fichier • fo: = nom du dossier</string>
+  <string name="TR_SCREENSONG_HELPMESSAGEPARTY">1-6 = Pressez votre numéro d'équipe afin d'utiliser une chanson joker au hasard</string>
+  <string name="TR_SCREENSONG_SORTING">Classement en cours : %s</string>
+  <string name="TR_SCREENSONG_NOMEDLEY">Aucun Medley pour cette chanson !</string>
  <string name="TR_SCREENSING_PAUSE">Pause</string>
  <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_SCREENSING_NOMORESONGS">Plus aucune chanson dans la playlist !</string>
+  <string name="TR_SCREENSING_NOWEBCAM">Pas de webcam disponible !</string>
+  <string name="TR_SCREENSING_ASPECTRATIO">Ratio d'aspect : %a</string>
+  <string name="TR_SCREENSING_SKIPPEDSECONDS">%s secondes passées</string>
  <string name="TR_SCREENSCORE_SCORES">Scores</string>
  <string name="TR_SCREENSCORE_RATING">Note</string>
  <string name="TR_SCREENSCORE_POINTS">Points</string>
@@ -242,4 +251,29 @@
  <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Volume</string>
  <string name="TR_SCREENPSERVERQR_ADDRESS">Adresse du serveur</string>
  <string name="TR_SCREENPSERVERQR_NOTRUNNING">Le serveur ne fonctionne pas. Merci de vérifier config.xml !</string>
+  <string name="TR_REPORTER_TITLE_TEXT">Nous sommes désolés</string>
+  <string name="TR_REPORTER_MESSAGE_CRASH_TEXT">Vocaluxe a rencontré une erreur ou un bug.
+Pour nous aider à résoudre le problème, envoyez-nous un rapport.
+Avant de soumettre le bug, modifiez le journal pour supprimer des informations sensibles.</string>
+  <string name="TR_REPORTER_MESSAGE_NO_CRASH_TEXT">Vous avez rencontré une erreur ou un bug.
+Pour nous aider à résoudre le problème, envoyez-nous un rapport.
+Avant de soumettre le bug, modifiez le journal suivant pour supprimer des informations sensibles.</string>
+  <string name="TR_REPORTER_NO_UPLOAD_TEXT">N'envoi rien (vous pouvez toujours copier le message d'erreur ci-dessus)</string>
+  <string name="TR_REPORTER_GIST_AND_ISSUE_TEXT">Envoyer et ouvrir un problème (visible publiquement + nécessite un compte github)</string>
+  <string name="TR_REPORTER_GIST_ONLY_TEXT">Envoyer et obtenir le lien de votre rapport (visible publiquement)</string>
+  <string name="TR_REPORTER_SUBMIT_STEP0_TEXT">Soumettre</string>
+  <string name="TR_REPORTER_SUBMIT_STEP1_TEXT">Envoyer</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_EXIT_TEXT">Quitter</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_CONTINUE_TEXT">Continuer</string>
+  <string name="TR_REPORTER_SUBMITED_MESSAGE_TEXT">Lien de votre rapport:</string>
+  <string name="TR_REPORTER_LOGUPLOAD_ERROR_TEXT">Erreur lors de l'envoi du journal.</string>
+  <string name="TR_REPORTER_LAST_ERROR_TITLE_TEXT">Dernière erreur</string>
+  <string name="TR_REPORTER_LAST_ERROR_NA">Indisponible</string>
+  <string name="TR_REPORTER_ISSUE_TEMPLATE">Décrivez votre problème ici.
+
+### Procédure de reproduction
+Dites-nous comment reproduire ce problème.
+### Version Vocaluxe et fichier journal
+{0}
+{1}</string>
 </resources>
@@ -15,6 +15,7 @@
  <string name="TR_DEBUG_SONGS">Canzoni caricate</string>
  <string name="TR_DEBUG_MOUSE">Mouse</string>
  <string name="TR_DEBUG_MEMORY">Uso della Memoria</string>
+  <string name="TR_GAMEMODE">Modalità di gioco</string>
  <string name="TR_GAMEMODE_NORMAL">Normale</string>
  <string name="TR_GAMEMODE_DUET">Duetto</string>
  <string name="TR_GAMEMODE_MEDLEY">Medley</string>
@@ -31,6 +32,10 @@
  <string name="TR_USERROLE_NORMAL">Utente normale</string>
  <string name="TR_USERROLE_ADMIN">Amministratore</string>
  <string name="TR_USERROLE_KEYBOARDUSER">Tasti Utente</string>
+  <string name="TR_SONGSOURCE">Sorgente della Canzone</string>
+  <string name="TR_SONGSOURCE_PLAYLIST">Playlist</string>
+  <string name="TR_SONGSOURCE_CATEGORY">Categoria</string>
+  <string name="TR_SONGSOURCE_ALLSONGS">Tutte le canzoni</string>  
  <string name="TR_CONFIG_SOFTWARE">Software</string>
  <string name="TR_CONFIG_OPENGL">OpenGL</string>
  <string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -51,7 +56,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>
@@ -84,6 +89,7 @@
  <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Niente</string>
  <string name="TR_CONFIG_LYRICSTYLE_FILL">Riempi</string>
  <string name="TR_CONFIG_LYRICSTYLE_JUMP">Salta</string>
+  <string name="TR_CONFIG_LYRICSTYLE_SLIDE">Slide</string>
  <string name="TR_CONFIG_LYRICSTYLE_ZOOM">Zoom</string>
  <string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Sotto</string>
  <string name="TR_CONFIG_LYRICSPOSITION_TOP">Sopra</string>
@@ -119,10 +125,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>
@@ -146,10 +152,21 @@
  <string name="TR_SCREENSONG_NUMSONGS">(%v Canzoni)</string>
  <string name="TR_SCREENSONG_NUMSONG">(%v Canzone)</string>
  <string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
+  <string name="TR_SCREENSONG_HELPMESSAGE">A-Z = Salta alla lettera • F3 = Cerca • CTRL+R = Selezione casuale • CTRL+S = Inizia medley • CTRL+# = Cambia l\'ordinamento delle canzoni • CTRL+T = Attiva/Disattiva visualizzazione categoria • Space = Apri impostazioni canzone • ESC = Ritorna al menu principale</string>
+  <string name="TR_SCREENSONG_HELPMESSAGESEARCH">A-Z = Cerca artista e titolo, prefissi per la ricerca → a: = artista • t: = titolo • c: = creatore • e: = edizione • g: = genere • y: = anno (es. 1999 o 1980-1989) • l: = lingua • al: = album • fi: = nome file • fo: = nome cartella</string>
+  <string name="TR_SCREENSONG_HELPMESSAGEPARTY">1-6: Premi il numero del tuo team per usare una canzone giullare casuale</string>
+  <string name="TR_SCREENSONG_SORTING">Ordinamento: %s</string>
+  <string name="TR_SCREENSONG_NOMEDLEY">Nessun Medley per questa canzone!</string>
  <string name="TR_SCREENSING_PAUSE">Pausa</string>
  <string name="TR_SCREENSING_BUTTON_CANCEL">Smetti di cantare</string>
  <string name="TR_SCREENSING_BUTTON_CONTINUE">Continua</string>
  <string name="TR_SCREENSING_BUTTON_SKIP">Salta questa canzone</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_ROUND">Rinizia turno</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_GAME">Rinizia il gioco</string>
+  <string name="TR_SCREENSING_NOMORESONGS">Nessun\'altra canzone nella playlist!</string>
+  <string name="TR_SCREENSING_NOWEBCAM">Nessuna webcam disponibile!</string>
+  <string name="TR_SCREENSING_ASPECTRATIO">Proporzioni: %a</string>
+  <string name="TR_SCREENSING_SKIPPEDSECONDS">Saltati %s secondi</string>
  <string name="TR_SCREENSCORE_SCORES">Punteggi</string>
  <string name="TR_SCREENSCORE_RATING">Voto</string>
  <string name="TR_SCREENSCORE_POINTS">Punti</string>
@@ -182,8 +199,10 @@
  <string name="TR_SCREENOGAME_SONGMENU">Menu canzone</string>
  <string name="TR_SCREENOGAME_SONGSORTING">Ordine canzone</string>
  <string name="TR_SCREENOGAME_TABS">Schede</string>
+  <string name="TR_SCREENOGAME_AUTOPLAYPREVIEWS">Riproduci automaticamente le anteprime delle canzoni</string>
  <string name="TR_SCREENOGAME_DIFFICULTY">Difficoltà gioco</string>
  <string name="TR_SCREENOGAME_TIMERMODE">Modalità a tempo</string>
+  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Stile del punteggio più alto</string>
  <string name="TR_SCREENORECORD_OPTIONS">Opzioni registrazione</string>
  <string name="TR_SCREENORECORD_DEVICE">Dispositivo</string>
  <string name="TR_SCREENORECORD_INPUT">Input</string>
@@ -223,7 +242,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>
@@ -232,4 +251,19 @@
  <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Volume</string>
  <string name="TR_SCREENPSERVERQR_ADDRESS">Indirizzo server</string>
  <string name="TR_SCREENPSERVERQR_NOTRUNNING">Il server non sta funzionando. Per favore controlla il file config.xml!</string>
+  <string name="TR_REPORTER_TITLE_TEXT">Siamo spiacenti</string>
+  <string name="TR_REPORTER_MESSAGE_CRASH_TEXT">che Vocaluxe si è imbattuto in un errore e si è arrestato.\r\nPer aiutarci a risolvere il problema, vi preghiamo di inviarci un rapporto.\r\nModifica il seguente log prima di inviare per rimuovere le informazioni eventualmente sensibili.</string>
+  <string name="TR_REPORTER_MESSAGE_NO_CRASH_TEXT">che Vocaluxe si è imbattuto in un errore.\r\nPer aiutarci a risolvere il problema, vi preghiamo di inviarci un rapporto.\r\nModifica il seguente log prima di inviare per rimuovere le informazioni eventualmente sensibili.</string>
+  <string name="TR_REPORTER_NO_UPLOAD_TEXT">Non caricare niente (puoi comunque copiare il messaggio di errore soprastante)</string>
+  <string name="TR_REPORTER_GIST_AND_ISSUE_TEXT">Carica e apri una segnalazione (visibile pubblicamente + richiede un account github)</string>
+  <string name="TR_REPORTER_GIST_ONLY_TEXT">Carica e ottieni un link per il tuo rapporto (visibile pubblicamente)</string>
+  <string name="TR_REPORTER_SUBMIT_STEP0_TEXT">Invia</string>
+  <string name="TR_REPORTER_SUBMIT_STEP1_TEXT">Caricamento</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_EXIT_TEXT">Esci</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_CONTINUE_TEXT">Continua</string>
+  <string name="TR_REPORTER_SUBMITED_MESSAGE_TEXT">Il link al tuo rapporto:</string>
+  <string name="TR_REPORTER_LOGUPLOAD_ERROR_TEXT">Errore nel caricamento del registro</string>
+  <string name="TR_REPORTER_LAST_ERROR_TITLE_TEXT">Ultimo errore</string>
+  <string name="TR_REPORTER_LAST_ERROR_NA">Non disponibile</string>
+  <string name="TR_REPORTER_ISSUE_TEMPLATE">Descrivi qui il tuo problema.\n\n### Passaggi per riprodurre \nDiteci come riprodurre questo problema.\n\n### Versione di Vocaluxe e file di registro\n{0}\n{1}</string>
 </resources>
@@ -15,6 +15,7 @@
  <string name="TR_DEBUG_SONGS">Músicas carregadas</string>
  <string name="TR_DEBUG_MOUSE">Rato</string>
  <string name="TR_DEBUG_MEMORY">Utilização da Memória</string>
+  <string name="TR_GAMEMODE">Modo de Jogo</string>
  <string name="TR_GAMEMODE_NORMAL">Normal</string>
  <string name="TR_GAMEMODE_DUET">Dueto</string>
  <string name="TR_GAMEMODE_MEDLEY">Miscelânea</string>
@@ -31,6 +32,10 @@
  <string name="TR_USERROLE_NORMAL">Utilizador Normal</string>
  <string name="TR_USERROLE_ADMIN">Administrador</string>
  <string name="TR_USERROLE_KEYBOARDUSER">Utilizador de Teclado</string>
+  <string name="TR_SONGSOURCE">Origem da Música</string>
+  <string name="TR_SONGSOURCE_PLAYLIST">Lista de Reprodução</string>
+  <string name="TR_SONGSOURCE_CATEGORY">Categoria</string>
+  <string name="TR_SONGSOURCE_ALLSONGS">Todas as Músicas</string>  
  <string name="TR_CONFIG_SOFTWARE">Software</string>
  <string name="TR_CONFIG_OPENGL">OpenGL</string>
  <string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -73,6 +78,8 @@
  <string name="TR_CONFIG_TIMERMODE_TOTAL">Total</string>
  <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
  <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Expandida</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_ALL">Mostrar Todas</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_BEST">Mostrar as Melhores</string>
  <string name="TR_CONFIG_OWN_MUSIC">Apenas musica e musica de fundo</string>
  <string name="TR_CONFIG_NO_OWN_MUSIC">Não utilizar música própria</string>
  <string name="TR_CONFIG_ONLY_OWN_MUSIC">Apenas música própria</string>
@@ -80,6 +87,10 @@
  <string name="TR_CONFIG_FADEPLAYERINFO_ALL">Todas</string>
  <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Apenas nomes e avatares</string>
  <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Nada</string>
+  <string name="TR_CONFIG_LYRICSTYLE_FILL">Preencher</string>
+  <string name="TR_CONFIG_LYRICSTYLE_JUMP">Saltar</string>
+  <string name="TR_CONFIG_LYRICSTYLE_SLIDE">Deslizar</string>
+  <string name="TR_CONFIG_LYRICSTYLE_ZOOM">Aumentar</string>
  <string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Fundo</string>
  <string name="TR_CONFIG_LYRICSPOSITION_TOP">Topo</string>
  <string name="TR_CONFIG_LYRICSPOSITION_BOTH">Topo e Fundo</string>
@@ -145,6 +156,10 @@
  <string name="TR_SCREENSING_BUTTON_CANCEL">Terminar de cantar</string>
  <string name="TR_SCREENSING_BUTTON_CONTINUE">Continuar</string>
  <string name="TR_SCREENSING_BUTTON_SKIP">Saltar esta música</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_ROUND">Recomeçar a Ronda</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_GAME">Recomeçar o Jogo</string>
+  <string name="TR_SCREENSING_NOMORESONGS">Sem mais Músicas na sua lista de reprodução!</string>
+  <string name="TR_SCREENSING_NOWEBCAM">Nenhuma câmara web disponível!</string>
  <string name="TR_SCREENSCORE_SCORES">Pontuações</string>
  <string name="TR_SCREENSCORE_RATING">Classificação</string>
  <string name="TR_SCREENSCORE_POINTS">Pontos</string>
@@ -177,8 +192,10 @@
  <string name="TR_SCREENOGAME_SONGMENU">Menu das Músicas</string>
  <string name="TR_SCREENOGAME_SONGSORTING">Ordenação das Musicas</string>
  <string name="TR_SCREENOGAME_TABS">Separadores </string>
+  <string name="TR_SCREENOGAME_AUTOPLAYPREVIEWS">Autoplay das Amostras de Músicas</string>
  <string name="TR_SCREENOGAME_DIFFICULTY">Dificildade do Jogo</string>
  <string name="TR_SCREENOGAME_TIMERMODE">Modo Temporizado</string>
+  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Estilo da Melhor Pontuação</string>
  <string name="TR_SCREENORECORD_OPTIONS">Opções de Gravação</string>
  <string name="TR_SCREENORECORD_DEVICE">Dispositivo </string>
  <string name="TR_SCREENORECORD_INPUT">Entrada</string>
@@ -197,6 +214,7 @@
  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Origem da Música de Fundo</string>
  <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Prévisualizar Volume da Música</string>
  <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Volume da Música no Jogo</string>
+  <string name="TR_SCREENOSOUND_KARAOKEEFFECT">Efeito Karaoke</string>
  <string name="TR_SCREENOTHEME_OPTIONS">Opções do Tema</string>
  <string name="TR_SCREENOTHEME_THEME">Tema</string>
  <string name="TR_SCREENOTHEME_SKIN">Skin</string>
@@ -226,4 +244,19 @@
  <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Volume</string>
  <string name="TR_SCREENPSERVERQR_ADDRESS">Endereço do Servidor</string>
  <string name="TR_SCREENPSERVERQR_NOTRUNNING">Servidor não está em execução. Por favor verifique o config.xml!</string>
+  <string name="TR_REPORTER_TITLE_TEXT">Pedimos Desculpa</string>
+  <string name="TR_REPORTER_MESSAGE_CRASH_TEXT">mas o Vocaluxe encontrou um erro e crashou.\r\nPara nos ajudares a resolver a questão envia-nos um relatório.\r\nSugerimos que edites o log seguinte antes de enviares para removeres alguma informação sigilosa.</string>
+  <string name="TR_REPORTER_MESSAGE_NO_CRASH_TEXT">que tenhas sofrido um problema.\r\nPara nos ajudares a resolver a questão envia-nos um relatório.\r\nSugerimos que edites o log seguinte antes de enviares para removeres alguma informação sigilosa.</string>
+  <string name="TR_REPORTER_NO_UPLOAD_TEXT">Não fazer upload de nada (ainda podes copiar o código de erro que está por cima)</string>
+  <string name="TR_REPORTER_GIST_AND_ISSUE_TEXT">Fazer upload e abrir um problema (visível publicamente e requer uma conta github)</string>
+  <string name="TR_REPORTER_GIST_ONLY_TEXT">Fazer upload e obter um link para o teu relatório (visível publicamente)</string>
+  <string name="TR_REPORTER_SUBMIT_STEP0_TEXT">Submeter</string>
+  <string name="TR_REPORTER_SUBMIT_STEP1_TEXT">Uploading</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_EXIT_TEXT">Sair</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_CONTINUE_TEXT">Continuar</string>
+  <string name="TR_REPORTER_SUBMITED_MESSAGE_TEXT">O Link para o teu relatório:</string>
+  <string name="TR_REPORTER_LOGUPLOAD_ERROR_TEXT">Erro a fazer upload do log.</string>
+  <string name="TR_REPORTER_LAST_ERROR_TITLE_TEXT">Último erro</string>
+  <string name="TR_REPORTER_LAST_ERROR_NA">Indisponível</string>
+  <string name="TR_REPORTER_ISSUE_TEMPLATE">Descreve o teu problema aqui.\n\n### Passos para o reproduzir novamente \nDiz-nos como reproduzir este problema.\n\n### Versão do Vocaluxe e ficheiro Log\n{0}\n{1}</string>
 </resources>
@@ -0,0 +1,269 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="language">Русский</string>
+  <string name="TR_PROGRAM_NAME">Вокалюкс</string>
+  <string name="TR_GENERAL_AND">и</string>
+  <string name="TR_BUTTON_EXIT">Выход</string>
+  <string name="TR_BUTTON_SAVE">Сохранить</string>
+  <string name="TR_BUTTON_BACK">Назад</string>
+  <string name="TR_BUTTON_START">Старт</string>
+  <string name="TR_DEBUG_AUDIO_STREAMS">Аудиопотоки</string>
+  <string name="TR_DEBUG_VIDEO_STREAMS">Видеопотоки</string>
+  <string name="TR_DEBUG_TEXTURES">Текстуры</string>
+  <string name="TR_DEBUG_TONE_ABS">ToneAbs</string>
+  <string name="TR_DEBUG_MAX_VOLUME">Макс. громкость</string>
+  <string name="TR_DEBUG_SONGS">Загруженные песни</string>
+  <string name="TR_DEBUG_MOUSE">Мышь</string>
+  <string name="TR_DEBUG_MEMORY">Память</string>
+  <string name="TR_GAMEMODE">Игровой режим</string>
+  <string name="TR_GAMEMODE_NORMAL">Нормальный</string>
+  <string name="TR_GAMEMODE_DUET">Дуэт</string>
+  <string name="TR_GAMEMODE_MEDLEY">Попурри</string>
+  <string name="TR_GAMEMODE_SHORTSONG">Краткая версия</string>
+  <string name="TR_RATING_VOCAL_HERO">Вокальный Герой</string>
+  <string name="TR_RATING_SUPERSTAR">Суперзвезда</string>
+  <string name="TR_RATING_LEAD_SINGER">Ведущий певец</string>
+  <string name="TR_RATING_RISING_STAR">Восходящая звезда</string>
+  <string name="TR_RATING_HOPEFUL">Многообещающий</string>
+  <string name="TR_RATING_WANNABE">Подражатель</string>
+  <string name="TR_RATING_AMATEUR">Любитель</string>
+  <string name="TR_RATING_TONE_DEAF">Нету слуха</string>
+  <string name="TR_USERROLE_GUEST">Гость</string>
+  <string name="TR_USERROLE_NORMAL">Обычный пользователь</string>
+  <string name="TR_USERROLE_ADMIN">Администратор</string>
+  <string name="TR_USERROLE_KEYBOARDUSER">Пользователь клавиатуры</string>
+  <string name="TR_SONGSOURCE">Источник песни</string>
+  <string name="TR_SONGSOURCE_PLAYLIST">Плейлист</string>
+  <string name="TR_SONGSOURCE_CATEGORY">Категория</string>
+  <string name="TR_SONGSOURCE_ALLSONGS">Все песни</string>  
+  <string name="TR_CONFIG_SOFTWARE">Программное обеспечение</string>
+  <string name="TR_CONFIG_OPENGL">OpenGL</string>
+  <string name="TR_CONFIG_DIRECT3D">Direct3D</string>
+  <string name="TR_CONFIG_TEXTURE_LOWEST">Низший</string>
+  <string name="TR_CONFIG_TEXTURE_LOW">Низкий</string>
+  <string name="TR_CONFIG_TEXTURE_MEDIUM">Средний</string>
+  <string name="TR_CONFIG_TEXTURE_HIGH">Высокий</string>
+  <string name="TR_CONFIG_TEXTURE_HIGHEST">Наивысший</string>
+  <string name="TR_CONFIG_OFF">Выкл.</string>
+  <string name="TR_CONFIG_ON">Вкл.</string>
+  <string name="TR_CONFIG_ONLY_FPS">Только FPS</string>
+  <string name="TR_CONFIG_LEVEL1">Уровень 1</string>
+  <string name="TR_CONFIG_LEVEL2">Уровень 2</string>
+  <string name="TR_CONFIG_LEVEL3">Уровень 3</string>
+  <string name="TR_CONFIG_LEVEL_MAX">Макс.</string>
+  <string name="TR_CONFIG_LIST">Список</string>
+  <string name="TR_CONFIG_DREIDEL">Дрейдл</string>
+  <string name="TR_CONFIG_TILE_BOARD">Плитки</string>
+  <string name="TR_CONFIG_BOOK">Книга</string>
+  <string name="TR_CONFIG_COVERLOADING_ONDEMAND">По требованию</string>
+  <string name="TR_CONFIG_COVERLOADING_ATSTART">При запуске</string>
+  <string name="TR_CONFIG_COVERLOADING_DYNAMIC">Динамически</string>
+  <string name="TR_CONFIG_NONE">Нет</string>
+  <string name="TR_CONFIG_RANDOM">Случайно</string>
+  <string name="TR_CONFIG_FOLDER">Папка</string>
+  <string name="TR_CONFIG_ARTIST">Исполнитель</string>
+  <string name="TR_CONFIG_ARTIST_LETTER">Исполнитель по букве</string>
+  <string name="TR_CONFIG_TITLE_LETTER">Название по букве</string>
+  <string name="TR_CONFIG_EDITION">Версия</string>
+  <string name="TR_CONFIG_GENRE">Жанр</string>
+  <string name="TR_CONFIG_YEAR">Год</string>
+  <string name="TR_CONFIG_DECADE">Десятилетие</string>
+  <string name="TR_CONFIG_LANGUAGE">Язык</string>
+  <string name="TR_CONFIG_DATEADDED">Дата добавления</string>
+  <string name="TR_CONFIG_EASY">Лёгкая</string>
+  <string name="TR_CONFIG_NORMAL">Нормальная</string>
+  <string name="TR_CONFIG_HARD">Сложная</string>
+  <string name="TR_CONFIG_TIMERMODE_CURRENT">Текущее</string>
+  <string name="TR_CONFIG_TIMERMODE_REMAINING">Оставшееся</string>
+  <string name="TR_CONFIG_TIMERMODE_TOTAL">Общее</string>
+  <string name="TR_CONFIG_TIMERLOOK_NORMAL">Обычное</string>
+  <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Расширенное</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_ALL">Список всех</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_BEST">Список лучших</string>
+  <string name="TR_CONFIG_OWN_MUSIC">Собственная музыка и фоновая музыка</string>
+  <string name="TR_CONFIG_NO_OWN_MUSIC">Без собственной музыки</string>
+  <string name="TR_CONFIG_ONLY_OWN_MUSIC">Только собственная музыка</string>
+  <string name="TR_CONFIG_ONLY_SONG">Только выбранная песня</string>
+  <string name="TR_CONFIG_FADEPLAYERINFO_ALL">Все</string>
+  <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Только имена и аватары</string>
+  <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Ничего</string>
+  <string name="TR_CONFIG_LYRICSTYLE_FILL">Заполнение</string>
+  <string name="TR_CONFIG_LYRICSTYLE_JUMP">Прыжок</string>
+  <string name="TR_CONFIG_LYRICSTYLE_SLIDE">Слайд</string>
+  <string name="TR_CONFIG_LYRICSTYLE_ZOOM">Зум</string>
+  <string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Внизу</string>
+  <string name="TR_CONFIG_LYRICSPOSITION_TOP">Сверху</string>
+  <string name="TR_CONFIG_LYRICSPOSITION_BOTH">Сверху и снизу</string>
+  <string name="TR_CONFIG_LYRICSPOSITION_DYNAMIC">Динамический</string>
+  <string name="TR_SCREENLOAD_LOADING">Загрузка</string>
+  <string name="TR_SCREENLOAD_TOTAL">Весь</string>
+  <string name="TR_SCREENLOAD_SONGS">песни</string>
+  <string name="TR_SCREENLOAD_LOADED">загружен</string>
+  <string name="TR_SCREENMAIN_MENU">Общее Меню</string>
+  <string name="TR_SCREENMAIN_BUTTON_SING">Пение</string>
+  <string name="TR_SCREENMAIN_BUTTON_PARTY">Вечеринка</string>
+  <string name="TR_SCREENMAIN_BUTTON_OPTIONS">Опции</string>
+  <string name="TR_SCREENMAIN_BUTTON_PROFILES">Профили</string>
+  <string name="TR_SCREENMAIN_TEXT_NOPROFILES">Профили не найдены!</string>
+  <string name="TR_SCREENPARTY_TITLE">Выбор режима Вечеринки</string>
+  <string name="TR_SCREENPARTY_MODES">Режим Вечеринки</string>
+  <string name="TR_SCREENPARTY_DESCRIPTION">Описание</string>
+  <string name="TR_SCREENPARTY_AUTHOR">Автор</string>
+  <string name="TR_SCREENPARTY_VERSION">Версия</string>
+  <string name="TR_SCREENPARTY_ERROR">Не получилось загрузить этот режим вечеринки. </string>
+  <string name="TR_SCREENPARTY_ERROR_MICS">Нет настроенных микрофонов!</string>
+  <string name="TR_SCREENPARTY_ERROR_MIC_NUM">%d микрофон(ов) необходимо для этого режима вечеринки!</string>
+  <string name="TR_SCREENPARTY_TARGETAUDIENCE">Целевая аудитория</string>
+  <string name="TR_SCREENPARTY_NOTEAMS">Нет команд</string>
+  <string name="TR_SCREENPARTY_NUMTEAMS">Количество команд</string>
+  <string name="TR_SCREENPARTY_NUMPLAYERS">Количество игроков</string>
+  <string name="TR_SCREENNAMES_MENU">Выбор игроков</string>
+  <string name="TR_SCREENNAMES_PLAYER">Игрок</string>
+  <string name="TR_SCREENNAMES_1PLAYER">1 игрок</string>
+  <string name="TR_SCREENNAMES_2PLAYER">2 игрока</string>
+  <string name="TR_SCREENNAMES_3PLAYER">3 игрока</string>
+  <string name="TR_SCREENNAMES_4PLAYER">4 игрока</string>
+  <string name="TR_SCREENNAMES_5PLAYER">5 игроков</string>
+  <string name="TR_SCREENNAMES_6PLAYER">6 игроков</string>
+  <string name="TR_SCREENNAMES_WARNING_MICS_SG">Внимание: Не обнаружен микрофон игрока %v!</string>
+  <string name="TR_SCREENNAMES_WARNING_MICS_PL">Внимание: Не обнаружены микрофоны игроков %v!</string>
+  <string name="TR_SCREENNAMES_WARNING_PROFILES_SG">Внимание: Не обнаружен профиль игрока %v!</string>
+  <string name="TR_SCREENNAMES_WARNING_PROFILES_PL">Внимание: Не обнаружены профили игроков %v!</string>
+  <string name="TR_SCREENSONG_MENU">Выбор песни</string>
+  <string name="TR_SCREENSONG_BUTTON_SING">Петь</string>
+  <string name="TR_SCREENSONG_BUTTON_PLAYLIST">Добавить в плейлист</string>
+  <string name="TR_SCREENSONG_BUTTON_CANCEL">Закрыть</string>
+  <string name="TR_SCREENSONG_BUTTON_RANDOM">Выбрать случайную песню</string>
+  <string name="TR_SCREENSONG_BUTTON_RANDOMCAT">Выбрать случяйную категорию</string>
+  <string name="TR_SCREENSONG_BUTTON_SINGALL">Петь все песни</string>
+  <string name="TR_SCREENSONG_BUTTON_SINGALLVISIBLE">Петь все видимые песни</string>
+  <string name="TR_SCREENSONG_BUTTON_OPENPLAYLIST">Открыть плейлист</string>
+  <string name="TR_SCREENSONG_BUTTON_OPEN_SELECTED_ITEM">Выбрать</string>
+  <string name="TR_SCREENSONG_BUTTON_RANDOMMEDLEY">Спеть случайное попурри</string>
+  <string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Петь попурри</string>
+  <string name="TR_SCREENSONG_NEWPLAYLIST">Новый плейлист</string>
+  <string name="TR_SCREENSONG_SONGOPTIONS">Опции пения</string>
+  <string name="TR_SCREENSONG_SEARCH">Поиск:</string>
+  <string name="TR_SCREENSONG_NOLANGUAGE">Нет языка</string>
+  <string name="TR_SCREENSONG_NOYEAR">Нет Года</string>
+  <string name="TR_SCREENSONG_NOGENRE">Нет Жанра</string>
+  <string name="TR_SCREENSONG_NOEDITION">Нет Версии</string>
+  <string name="TR_SCREENSONG_ALLSONGS">Все песни</string>
+  <string name="TR_SCREENSONG_NUMSONGS">(%v песни)</string>
+  <string name="TR_SCREENSONG_NUMSONG">(%v песня)</string>
+  <string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
+  <string name="TR_SCREENSONG_HELPMESSAGE">A-Z = Начать ввод • F3 = Поиск • CTRL+R = Случайный выбор • CTRL+S = Начать попурри • CTRL+# = Выбор сортировки песен • CTRL+T = Включить/Выключить просмотр категории • Space = Открыть параметры песни • ESC = Вернуться в главное меню</string>
+  <string name="TR_SCREENSONG_HELPMESSAGESEARCH">A-Z = Поиск исполнителя и названия, префиксы для поиска → a: = артист • t: = название • c: = автор • e: = версия • g: = жанр • y: = год (напр. 1999 или 1980-1989) • l: = язык • al: = альбом • fi: = имя файла • fo: = имя папки</string>
+  <string name="TR_SCREENSONG_HELPMESSAGEPARTY">1-6 = Нажмите номер вашей команды, чтобы использовать случайную песню джокер</string>
+  <string name="TR_SCREENSONG_SORTING">Сортировать: %s</string>
+  <string name="TR_SCREENSONG_NOMEDLEY">Нет Попурри для этой песни!</string>
+  <string name="TR_SCREENSING_PAUSE">Пауза</string>
+  <string name="TR_SCREENSING_BUTTON_CANCEL">Остановить пение</string>
+  <string name="TR_SCREENSING_BUTTON_CONTINUE">Продолжить</string>
+  <string name="TR_SCREENSING_BUTTON_SKIP">Пропустить эту песню</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_ROUND">Перезапустить раунд</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_GAME">Перезапустить игру</string>
+  <string name="TR_SCREENSING_NOMORESONGS">В плейлисте больше нет песен!</string>
+  <string name="TR_SCREENSING_NOWEBCAM">Веб-камера недоступна!</string>
+  <string name="TR_SCREENSING_ASPECTRATIO">Соотношение сторон: %a</string>
+  <string name="TR_SCREENSING_SKIPPEDSECONDS">Пропущено %s секунд</string>
+  <string name="TR_SCREENSCORE_SCORES">Счёт</string>
+  <string name="TR_SCREENSCORE_RATING">Рейтинг</string>
+  <string name="TR_SCREENSCORE_POINTS">Очки</string>
+  <string name="TR_SCREENSCORE_GAMEDIFFICULTY">Сложность</string>
+  <string name="TR_SCREENSCORE_OVERALLSCORE">Общий счёт</string>
+  <string name="TR_SCREENHIGHSCORE_HIGHSCORE">Рекорд</string>
+  <string name="TR_SCREENPROFILES_PROFILES">Профили</string>
+  <string name="TR_SCREENPROFILES_PLAYERNAME">Имя игрока</string>
+  <string name="TR_SCREENPROFILES_GAMEDIFFICULTY">Сложность игры</string>
+  <string name="TR_SCREENPROFILES_AVATAR">Аватар</string>
+  <string name="TR_SCREENPROFILES_USERROLE">Роль</string>
+  <string name="TR_SCREENPROFILES_ACTIVE">Активный</string>
+  <string name="TR_SCREENPROFILES_BUTTON_NEW">Новый</string>
+  <string name="TR_SCREENPROFILES_BUTTON_DELETE">Удалить</string>
+  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Сделать снимок</string>
+  <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Сохранить снимок</string>
+  <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Удалить снимок</string>
+  <string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Веб-камера</string>
+  <string name="TR_SCREENO_OPTIONS">Опции</string>
+  <string name="TR_SCREENO_BUTTON_GAME">Игра</string>
+  <string name="TR_SCREENO_BUTTON_SOUND">Звук</string>
+  <string name="TR_SCREENO_BUTTON_RECORD">Запись</string>
+  <string name="TR_SCREENO_BUTTON_VIDEO">Видео</string>
+  <string name="TR_SCREENO_BUTTON_LYRICS">Текст песни</string>
+  <string name="TR_SCREENO_BUTTON_THEME">Тема</string>
+  <string name="TR_SCREENOGAME_BUTTON_SERVER">Адрес сервера</string>
+  <string name="TR_SCREENOGAME_OPTIONS">Опции игры</string>
+  <string name="TR_SCREENOGAME_LANGUAGE">Язык</string>
+  <string name="TR_SCREENOGAME_DEBUGLEVEL">Уровень отладки</string>
+  <string name="TR_SCREENOGAME_SONGMENU">Стиль меню песни</string>
+  <string name="TR_SCREENOGAME_SONGSORTING">Сортировка песен</string>
+  <string name="TR_SCREENOGAME_TABS">Вкладки</string>
+  <string name="TR_SCREENOGAME_AUTOPLAYPREVIEWS">Автозапуск предпросмотра песен</string>
+  <string name="TR_SCREENOGAME_DIFFICULTY">Сложность игры</string>
+  <string name="TR_SCREENOGAME_TIMERMODE">Режим таймера</string>
+  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Стиль Рекордов</string>
+  <string name="TR_SCREENORECORD_OPTIONS">Параметры Записи</string>
+  <string name="TR_SCREENORECORD_DEVICE">Устройство</string>
+  <string name="TR_SCREENORECORD_INPUT">Ввод</string>
+  <string name="TR_SCREENORECORD_PLAYER_1">Игрок 1</string>
+  <string name="TR_SCREENORECORD_PLAYER_2">Игрок 2</string>
+  <string name="TR_SCREENORECORD_PLAYER_3">Игрок 3</string>
+  <string name="TR_SCREENORECORD_PLAYER_4">Игрок 4</string>
+  <string name="TR_SCREENORECORD_PLAYER_5">Игрок 5</string>
+  <string name="TR_SCREENORECORD_PLAYER_6">Игрок 6</string>
+  <string name="TR_SCREENORECORD_MIC_DELAY">Задержка микрофона</string>
+  <string name="TR_SCREENORECORD_MIC_WARNING">Внимание: один из игроков назначен на два микрофона.</string>
+  <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Тест задержки</string>
+  <string name="TR_SCREENOSOUND_OPTIONS">Настройки Звука</string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSIC">Фоновая музыка</string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Громкость фоновой музыки</string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Источник фоновой музыки</string>
+  <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Предпрослушивание громкости музыки</string>
+  <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Громкость игровой музыки</string>
+  <string name="TR_SCREENOSOUND_KARAOKEEFFECT">Эффект Караоке</string>
+  <string name="TR_SCREENOTHEME_OPTIONS">Настройки темы</string>
+  <string name="TR_SCREENOTHEME_THEME">Тема</string>
+  <string name="TR_SCREENOTHEME_SKIN">Скин</string>
+  <string name="TR_SCREENOTHEME_COVERTHEME">Тема обложки</string>
+  <string name="TR_SCREENOTHEME_NOTELINES">Показать строки заметки</string>
+  <string name="TR_SCREENOTHEME_TONEHELPER">Показать тон-помощник</string>
+  <string name="TR_SCREENOTHEME_TIMERLOOK">Режим временной шкалы</string>
+  <string name="TR_SCREENOTHEME_FADEINFO">Угасание информации об игроке</string>
+  <string name="TR_SCREENOTHEME_COVERLOADING">Обложка-поведение при загрузке</string>
+  <string name="TR_SCREENOLYRICS_OPTIONS">Варианты песен</string>
+  <string name="TR_SCREENOLYRICS_STYLE">Стиль анимации</string>
+  <string name="TR_SCREENOLYRICS_POSITION">Позиция текста</string>
+  <string name="TR_SCREENOVIDEO_OPTIONS">Опции видео</string>
+  <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Видео фоны</string>
+  <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Предпросмотр видео</string>
+  <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Видео во время пения</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Отображение текущей фоновой музыки видео</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Веб-камеры</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Разрешение веб-камеры</string>
+  <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Настроить экран</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Нажмите CTRL + ALT (+ SHIFT) + Стрелки для настройки экрана</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTRL + ALT + 0 сброс</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Сверху слева</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Сверху справа</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Внизу слева</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT">Внизу справа</string>
+  <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Громкость</string>
+  <string name="TR_SCREENPSERVERQR_ADDRESS">Адрес сервера</string>
+  <string name="TR_SCREENPSERVERQR_NOTRUNNING">Сервер не работает. Пожалуйста, проверьте config.xml!</string>
+  <string name="TR_REPORTER_TITLE_TEXT">Нам очень жаль</string>
+  <string name="TR_REPORTER_MESSAGE_CRASH_TEXT">В Vocaluxe произошла ошибка и произошел сбой.\r\nЧтобы помочь нам решить проблему, отправьте нам отчет.\r\nИзмените следующий журнал перед отправкой, чтобы удалить потенциально конфиденциальную информацию.</string>
+  <string name="TR_REPORTER_MESSAGE_NO_CRASH_TEXT">что вы столкнулись с ошибкой.\r\nЧтобы помочь нам решить проблему, отправьте нам отчет..\r\nИзменить следующий журнал перед отправкой, чтобы удалить потенциально конфиденциальную информацию.</string>
+  <string name="TR_REPORTER_NO_UPLOAD_TEXT">Не загружать ничего (вы можете скопировать сообщение об ошибке выше)</string>
+  <string name="TR_REPORTER_GIST_AND_ISSUE_TEXT">Загрузить и откройть проблему (общедоступно + требуется учетная запись github)</string>
+  <string name="TR_REPORTER_GIST_ONLY_TEXT">Загрузить и получить ссылку на свой отчет (общедоступная)</string>
+  <string name="TR_REPORTER_SUBMIT_STEP0_TEXT">Отправить</string>
+  <string name="TR_REPORTER_SUBMIT_STEP1_TEXT">Загрузка</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_EXIT_TEXT">Выход</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_CONTINUE_TEXT">Продолжить</string>
+  <string name="TR_REPORTER_SUBMITED_MESSAGE_TEXT">Ссылка на ваш отчет:</string>
+  <string name="TR_REPORTER_LOGUPLOAD_ERROR_TEXT">Ошибка при загрузке журнала.</string>
+  <string name="TR_REPORTER_LAST_ERROR_TITLE_TEXT">Последняя ошибка</string>
+  <string name="TR_REPORTER_LAST_ERROR_NA">Не доступно</string>
+  <string name="TR_REPORTER_ISSUE_TEMPLATE">Опишите свою проблему здесь.\n\n### шаги для воспроизведения\nРасскажите, как воспроизвести эту проблему.\n\n### версию Vocaluxe и лог файл\n{0}\n{1}</string>
+</resources>
@@ -15,6 +15,7 @@
  <string name="TR_DEBUG_SONGS">Laddade låtar</string>
  <string name="TR_DEBUG_MOUSE">Mus</string>
  <string name="TR_DEBUG_MEMORY">Minnesanvändning</string>
+  <string name="TR_GAMEMODE">Spelläge</string>
  <string name="TR_GAMEMODE_NORMAL">Normal</string>
  <string name="TR_GAMEMODE_DUET">Duett</string>
  <string name="TR_GAMEMODE_MEDLEY">Medley</string>
@@ -31,6 +32,10 @@
  <string name="TR_USERROLE_NORMAL">Normal användare</string>
  <string name="TR_USERROLE_ADMIN">Administratör</string>
  <string name="TR_USERROLE_KEYBOARDUSER">Tangentbordsanvändare</string>
+  <string name="TR_SONGSOURCE">Låtkälla</string>
+  <string name="TR_SONGSOURCE_PLAYLIST">Spellista</string>
+  <string name="TR_SONGSOURCE_CATEGORY">Kategori</string>
+  <string name="TR_SONGSOURCE_ALLSONGS">Alla låtar</string>  
  <string name="TR_CONFIG_SOFTWARE">Mjukvara</string>
  <string name="TR_CONFIG_OPENGL">OpenGL</string>
  <string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -147,10 +152,21 @@
  <string name="TR_SCREENSONG_NUMSONGS">(%v låtar)</string>
  <string name="TR_SCREENSONG_NUMSONG">(%v låt)</string>
  <string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
+  <string name="TR_SCREENSONG_HELPMESSAGE">A-Z = Hoppa till bokstaven • F3 = Sök • CTRL+R = Slumpa • CTRL+S = Starta medley • CTRL+# = Ändra sångsortering • CTRL+T = Aktivera/Inaktivera kategorivy • Mellanslag = Öppna sångalternativ • ESC = Tillbaka till huvudmenyn</string>
+  <string name="TR_SCREENSONG_HELPMESSAGESEARCH">A-Z = Sök artist och titel, prefix för sökningen → a: = artist • t: = titel • c: = skapare • e: = utgåva • g: = genre • y: = år (t ex. 1999 eller 1980-1989) • l: = språk • al: = album • fi: = filnamn • fo: = mappnamn</string>
+  <string name="TR_SCREENSONG_HELPMESSAGEPARTY">1-6 = Tryck ditt lagnummer för att använda en slumpad sångjoker</string>
+  <string name="TR_SCREENSONG_SORTING">Sortering: %s</string>
+  <string name="TR_SCREENSONG_NOMEDLEY">Inget medley för denna sång!</string>
  <string name="TR_SCREENSING_PAUSE">Paus</string>
  <string name="TR_SCREENSING_BUTTON_CANCEL">Avsluta låt</string>
  <string name="TR_SCREENSING_BUTTON_CONTINUE">Fortsätt</string>
  <string name="TR_SCREENSING_BUTTON_SKIP">Hoppa över låt</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_ROUND">Starta om runda</string>
+  <string name="TR_SCREENSING_BUTTON_RESTART_GAME">Starta om spel</string>
+  <string name="TR_SCREENSING_NOMORESONGS">Inga fler sånger i spellistan!</string>
+  <string name="TR_SCREENSING_NOWEBCAM">Ingen webkamera tillgänglig!</string>
+  <string name="TR_SCREENSING_ASPECTRATIO">Bildformat: %a</string>
+  <string name="TR_SCREENSING_SKIPPEDSECONDS">Hoppade över %s sekunder</string>
  <string name="TR_SCREENSCORE_SCORES">Resultat</string>
  <string name="TR_SCREENSCORE_RATING">Rankning</string>
  <string name="TR_SCREENSCORE_POINTS">Poäng</string>
@@ -183,7 +199,7 @@
  <string name="TR_SCREENOGAME_SONGMENU">Låtmeny</string>
  <string name="TR_SCREENOGAME_SONGSORTING">Låtsortering</string>
  <string name="TR_SCREENOGAME_TABS">Flikar</string>
-  <string name="TR_SCREENOGAME_AUTOPLAYPREVIEWS">Förhandsvisa låtar automatiskt</string>
+  <string name="TR_SCREENOGAME_AUTOPLAYPREVIEWS">Förhandsgranska låt automatiskt</string>
  <string name="TR_SCREENOGAME_DIFFICULTY">Spelets svårighetsgrad</string>
  <string name="TR_SCREENOGAME_TIMERMODE">Timerläge</string>
  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Topplistsvy</string>
@@ -235,4 +251,19 @@
  <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Volym</string>
  <string name="TR_SCREENPSERVERQR_ADDRESS">Serveradress</string>
  <string name="TR_SCREENPSERVERQR_NOTRUNNING">Servern körs inte. Var god kontrollera config.xml!</string>
+  <string name="TR_REPORTER_TITLE_TEXT">Vi ber om ursäkt</string>
+  <string name="TR_REPORTER_MESSAGE_CRASH_TEXT">så Vocaluxe sätte på ett fel och har kraschat..\r\nFör att hjälpa oss att åtgärda problemet, ber vi er att skicka oss en rapport.\r\nÄndra följande logg innan du skickar in den och ta bort eventuellt känslig information.</string>
+  <string name="TR_REPORTER_MESSAGE_NO_CRASH_TEXT">att du har upplevt ett fel.\r\nFör att hjälp oss att åtgärda problemet, så ber vi er skicka in er rapport.\r\nÄndra loggen innan den skickar in för att ta bort eventuellt känslig information.</string>
+  <string name="TR_REPORTER_NO_UPLOAD_TEXT">Ladda inte upp något. (du kan fortfarande kopiera felmeddelandet ovanför)</string>
+  <string name="TR_REPORTER_GIST_AND_ISSUE_TEXT">Ladda upp och felanmäla ett problem (Som kommer synas för alla och kräver ett github konto)</string>
+  <string name="TR_REPORTER_GIST_ONLY_TEXT">Ladda upp så får ni länk till er rapport (som kommer synas för alla) </string>
+  <string name="TR_REPORTER_SUBMIT_STEP0_TEXT">Skicka in</string>
+  <string name="TR_REPORTER_SUBMIT_STEP1_TEXT">Laddar upp</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_EXIT_TEXT">Lämna</string>
+  <string name="TR_REPORTER_SUBMIT_STEP2_CONTINUE_TEXT">Fortsätt</string>
+  <string name="TR_REPORTER_SUBMITED_MESSAGE_TEXT">Länken till er rapport.</string>
+  <string name="TR_REPORTER_LOGUPLOAD_ERROR_TEXT">Problem uppstod när loggen skulle skickas.</string>
+  <string name="TR_REPORTER_LAST_ERROR_TITLE_TEXT">Senaste fel</string>
+  <string name="TR_REPORTER_LAST_ERROR_NA">Inte tillgänglig</string>
+  <string name="TR_REPORTER_ISSUE_TEMPLATE">Beskriv ert problem här.\n\n### Steg att reproducera \ nBerätta för oss hur du reproducerat detta problem.\n\n### Vocaluxe-version och loggfil\n{0}\n{1}</string>
 </resources>
@@ -11,6 +11,7 @@
  <string name="TR_BUTTON_YES">Ano</string>
  <string name="TR_BUTTON_NO">Ne</string>
  <string name="TR_BUTTON_NEXT_ROUND">Další kolo</string>
+  <string name="TR_SONGS">Písně</string>
  <string name="TR_SCREENCONFIG_TITLE">Soutěžní režim: Nastavení</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERS">Počet hráčů</string>
  <string name="TR_SCREENCONFIG_NUMMICS">Počet mikrofonů</string>
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
  <string name="language">Magyar</string>
-  <string name="TR_PARTYMODE_NAME">Bajnokság Mód</string>
-  <string name="TR_PARTYMODE_DESCRIPTION">Bajnokság Módban egymás ellen</string>
+  <string name="TR_PARTYMODE_NAME">Bajnokság</string>
+  <string name="TR_PARTYMODE_DESCRIPTION">Bajnokság mód egymás ellen</string>
  <string name="TR_PARTYMODE_AUDIENCE">Azoknak akik szeretnék megmérettetni magukat egymás ellen</string>
  <string name="TR_BUTTON_NEXT">Következő</string>
  <string name="TR_BUTTON_BACK">Vissza</string>
@@ -15,6 +15,8 @@
  <string name="TR_SCREENCONFIG_NUMPLAYERS">Játékosok Száma</string>
  <string name="TR_SCREENCONFIG_NUMMICS">Mikrofonok Száma</string>
  <string name="TR_SCREENCONFIG_NUMROUNDS">Körök Száma</string>
+  <string name="TR_SCREENCONFIG_NUMJOKERS">Jokerek száma</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Jokerek újratöltése minden körben</string>
  <string name="TR_SCREENNAMES_TITLE">Bajnokság Mód: Válassz Játékost</string>
  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Véletlenszerű választás</string>
  <string name="TR_SCREENMAIN_TITLE">Bajnokság Mód: Áttekintés</string>
@@ -11,6 +11,7 @@
  <string name="TR_BUTTON_YES">Si</string>
  <string name="TR_BUTTON_NO">No</string>
  <string name="TR_BUTTON_NEXT_ROUND">Prossimo Turno</string>
+  <string name="TR_SONGS">Canzoni</string>
  <string name="TR_SCREENCONFIG_TITLE">Modalità Sfida: Configurazione</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERS">Numero di giocatori</string>
  <string name="TR_SCREENCONFIG_NUMMICS">Numero di microfoni</string>
@@ -11,10 +11,13 @@
  <string name="TR_BUTTON_YES">Sim</string>
  <string name="TR_BUTTON_NO">Não</string>
  <string name="TR_BUTTON_NEXT_ROUND">Ronda Seguinte</string>
+  <string name="TR_SONGS">Músicas</string>
  <string name="TR_SCREENCONFIG_TITLE">Modo Desafio: Configuração</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERS">Número de Jogadores</string>
  <string name="TR_SCREENCONFIG_NUMMICS">Número de microfones</string>
  <string name="TR_SCREENCONFIG_NUMROUNDS">Número de rondas</string>
+  <string name="TR_SCREENCONFIG_NUMJOKERS">Número de "Jokers"</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Recarregar os "Jokers" todas as rondas</string>
  <string name="TR_SCREENNAMES_TITLE">Modo Desafio: Escolher Jogador</string>
  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Escolha Aleatória</string>
  <string name="TR_SCREENMAIN_TITLE">Modo Desafio: Resumo</string>
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="language">Русский</string>
+  <string name="TR_PARTYMODE_NAME">Режим соревнования</string>
+  <string name="TR_PARTYMODE_DESCRIPTION">Сыграть несколько раундов соревнований.</string>
+  <string name="TR_PARTYMODE_AUDIENCE">Для всех, кому интересны дуэльные бои.</string>
+  <string name="TR_BUTTON_NEXT">Далее</string>
+  <string name="TR_BUTTON_BACK">Назад</string>
+  <string name="TR_BUTTON_START">Начать</string>
+  <string name="TR_BUTTON_EXIT">Выход</string>
+  <string name="TR_BUTTON_YES">Да</string>
+  <string name="TR_BUTTON_NO">Нет</string>
+  <string name="TR_BUTTON_NEXT_ROUND">Следующий раунд</string>
+  <string name="TR_SONGS">Песни</string>
+  <string name="TR_SCREENCONFIG_TITLE">Режим испытания: Конфигурация</string>
+  <string name="TR_SCREENCONFIG_NUMPLAYERS">Количество игроков</string>
+  <string name="TR_SCREENCONFIG_NUMMICS">Количество микрофонов</string>
+  <string name="TR_SCREENCONFIG_NUMROUNDS">Количество раундов</string>
+  <string name="TR_SCREENCONFIG_NUMJOKERS">Количество джокеров</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Пополняйте джокеры каждый раунд</string>
+  <string name="TR_SCREENNAMES_TITLE">Режим соревнования: Выбор игрока</string>
+  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Случайный выбор</string>
+  <string name="TR_SCREENMAIN_TITLE">Режим соревнования: Обзор</string>
+  <string name="TR_SCREENMAIN_TABLE_POS">Позиция</string>
+  <string name="TR_SCREENMAIN_TABLE_PLAYERNAME">Имя</string>
+  <string name="TR_SCREENMAIN_TABLE_NUMPLAYED">Раундов</string>
+  <string name="TR_SCREENMAIN_TABLE_WON">Побед</string>
+  <string name="TR_SCREENMAIN_TABLE_SINGPOINTS">Очки пения</string>
+  <string name="TR_SCREENMAIN_TABLE_GAMEPOINTS">Счёт</string>
+  <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Вы действительно хотите выйти?</string>
+  <string name="TR_SCREENMAIN_NEXT_PLAYER">Игрок следующего раунда:</string>
+  <string name="TR_SCREENMAIN_FINISH">Спеты все раунды! И победителем становится...</string>
+</resources>
@@ -13,19 +13,19 @@
  <string name="TR_BUTTON_NEXT_ROUND">Spustit</string>
  <string name="TR_SONGS">Písně</string>
  <string name="TR_TEAM">Tým</string>
-  <string name="TR_PLAYLIST">Seznam skladeb</string>
-  <string name="TR_CATEGORY">Skupina</string>
-  <string name="TR_ALLSONGS">Všechny písně</string>
  <string name="TR_SCREENCONFIG_TITLE">Tic-Tac-Toe: Nastavení</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST1">Počet hráčů v týmu 1</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Počet hráčů v týmu 2</string>
  <string name="TR_SCREENCONFIG_NUMFIELDS">Počet polí</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Zdroj písně</string>
-  <string name="TR_SCREENCONFIG_GAMEMODE">Herní režim</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Doplnit žolíky každé kolo</string>
+  <string name="TR_SCREENCONFIG_NUMJOKERS">Počet žolíků</string>
+  <string name="TR_SCREENCONFIG_SWITCH_PLAYER">Přepnout hráče</string>
  <string name="TR_SCREENNAMES_TITLE">Tic-Tac-Toe: Výběr hráče</string>
+  <string name="TR_SCREENNAMES_SELPLAYERSTITLE">Vybraní hráči pro tento tým:</string>
  <string name="TR_SCREENNAMES_TEAM1">Tým 1</string>
  <string name="TR_SCREENNAMES_TEAM2">Tým 2</string>
  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Vybrat náhodně</string>
+  <string name="TR_SCREENNAMES_HELPMESSAGE">Přidejte alespoň jednoho hráče do obou týmů! / Přetáhněte zástupné obrázky hráčů a přidejte je do seznamu vybraných hráčů! / Klepnutím pravým tlačítkem myši na jej zastupující obrázek vybraného hráče odeberete!</string>
  <string name="TR_SCREENMAIN_TITLE">Tic-Tac-Toe</string>
  <string name="TR_SCREENMAIN_TEAM_CHOOSE">Vybrat pole.</string>
  <string name="TR_SCREENMAIN_NEXT_PLAYER">Další hráč</string>
@@ -18,6 +18,8 @@
  <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_REFILLJOKERS">Joker nach jeder Runde auffüllen</string>
+  <string name="TR_SCREENCONFIG_NUMJOKERS">Joker-Anzahl</string>
+  <string name="TR_SCREENCONFIG_SWITCH_PLAYER">Spieler wechseln</string>
  <string name="TR_SCREENNAMES_TITLE">Tic-Tac-Toe: Spielerwahl</string>
  <string name="TR_SCREENNAMES_SELPLAYERSTITLE">Ausgewählte Spieler für dieses Team:</string>
  <string name="TR_SCREENNAMES_TEAM1">Team 1</string>
@@ -17,7 +17,9 @@
  <string name="TR_SCREENCONFIG_NUMPLAYERST1">Number of players in team 1</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Number of players in team 2</string>
  <string name="TR_SCREENCONFIG_NUMFIELDS">Number of fields</string>
-  <string name="TR_SCREENCONFIG_REFILLJOKERS">Refill jokers every round</string>  
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Refill jokers every round</string>
+  <string name="TR_SCREENCONFIG_NUMJOKERS">Number of jokers</string>
+  <string name="TR_SCREENCONFIG_SWITCH_PLAYER">Switch player</string>
  <string name="TR_SCREENNAMES_TITLE">Tic-Tac-Toe: Choose Player</string>
  <string name="TR_SCREENNAMES_SELPLAYERSTITLE">Selected players for this team:</string>
  <string name="TR_SCREENNAMES_TEAM1">Team 1</string>
@@ -13,15 +13,10 @@
  <string name="TR_BUTTON_NEXT_ROUND">Iniciar</string>
  <string name="TR_SONGS">Canciones</string>
  <string name="TR_TEAM">Equipo</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_SCREENCONFIG_TITLE">Ta-Te-Ti: Configuración</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST1">Nro. de cantantes equipo 1</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Nro. de cantantes equipo 2</string>
  <string name="TR_SCREENCONFIG_NUMFIELDS">Nro. de campos</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Origen de la canción</string>
-  <string name="TR_SCREENCONFIG_GAMEMODE">Modo de juego</string>
  <string name="TR_SCREENNAMES_TITLE">Ta-Te-Ti: Selección de cantante</string>
  <string name="TR_SCREENNAMES_TEAM1">Equipo 1</string>
  <string name="TR_SCREENNAMES_TEAM2">Equiipo 2</string>
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <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_NAME">Morpion</string>
+  <string name="TR_PARTYMODE_DESCRIPTION">Jouez au Morpion 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>
@@ -14,14 +14,18 @@
  <string name="TR_SONGS">Chansons</string>
  <string name="TR_TEAM">Equipe</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\'Équipe 1</string>
+  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Nombre de joueurs dans l\'Équipe 2</string>
  <string name="TR_SCREENCONFIG_NUMFIELDS">Nombre de champs</string>
  <string name="TR_SCREENCONFIG_REFILLJOKERS">Recharger les jokers a chaque tour</string>
+  <string name="TR_SCREENCONFIG_NUMJOKERS">Nombre de jokers</string>
+  <string name="TR_SCREENCONFIG_SWITCH_PLAYER">Changer de joueur</string>
  <string name="TR_SCREENNAMES_TITLE">Tic-Tac-Toe: Choix des joueurs</string>
+  <string name="TR_SCREENNAMES_SELPLAYERSTITLE">Joueurs sélectionnés pour cette équipe :</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_SCREENNAMES_HELPMESSAGE">Ajoutez au moins un joueur aux deux équipes ! / Tirez l'avatar d'un joueur vers la liste des joueurs sélectionnés ! / Faites un clic droit sur l'avatar d'un joueur pour le retirer !</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">Joueur suivant</string>
@@ -13,18 +13,14 @@
  <string name="TR_BUTTON_NEXT_ROUND">Kezdés</string>
  <string name="TR_SONGS">Dalok</string>
  <string name="TR_TEAM">Csapat</string>
-  <string name="TR_PLAYLIST">Dal Lista</string>
-  <string name="TR_CATEGORY">Kategória</string>
-  <string name="TR_ALLSONGS">Összes Dal</string>
  <string name="TR_SCREENCONFIG_TITLE">Tic-Tac-Toe: Beállítások</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST1">1. Csapat játékosainak száma</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST2">2. Csapat játékosainak száma</string>
  <string name="TR_SCREENCONFIG_NUMFIELDS">Mezők száma</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Dal-forrás</string>
-  <string name="TR_SCREENCONFIG_GAMEMODE">Játék Mód</string>
  <string name="TR_SCREENNAMES_TITLE">Tic-Tac-Toe: Válassz Játékost</string>
  <string name="TR_SCREENNAMES_TEAM1">1. Csapat</string>
  <string name="TR_SCREENNAMES_TEAM2">2. Csapat</string>
+  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Véletlenszerű választás</string>
  <string name="TR_SCREENMAIN_TITLE">Tic-Tac-Toe</string>
  <string name="TR_SCREENMAIN_TEAM_CHOOSE">Válassz egy mezőt.</string>
  <string name="TR_SCREENMAIN_NEXT_PLAYER">Következő Játékos</string>
@@ -13,15 +13,11 @@
  <string name="TR_BUTTON_NEXT_ROUND">Inizia</string>
  <string name="TR_SONGS">Canzoni</string>
  <string name="TR_TEAM">Squadra</string>
-  <string name="TR_PLAYLIST">Playlist</string>
-  <string name="TR_CATEGORY">Categoria</string>
-  <string name="TR_ALLSONGS">Tutte le canzoni</string>
  <string name="TR_SCREENCONFIG_TITLE">Tris: Configurazione</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST1">Numero di giocatori della squadra 1</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Numero di giocatori della squadra 2</string>
  <string name="TR_SCREENCONFIG_NUMFIELDS">Numero di caselle</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Sorgente della Canzone</string>
-  <string name="TR_SCREENCONFIG_GAMEMODE">Modalità di Gioco</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Ricarica i giullari ad ogni turno</string>
  <string name="TR_SCREENNAMES_TITLE">Tris: Scegli il Giocatore</string>
  <string name="TR_SCREENNAMES_TEAM1">Squadra 1</string>
  <string name="TR_SCREENNAMES_TEAM2">Squadra 2</string>
@@ -31,5 +27,5 @@
  <string name="TR_SCREENMAIN_NEXT_PLAYER">Prossimo giocatore</string>
  <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Vuoi veramente uscire dal Tris?</string>
  <string name="TR_SCREENMAIN_WINNER">E il vincitore è...</string>
-  <string name="TR_SCREENMAIN_NOWINNER">Non c'è nessun vincitore in questo turno...</string>
+  <string name="TR_SCREENMAIN_NOWINNER">Non c\'è nessun vincitore in questo turno...</string>
 </resources>
@@ -13,15 +13,10 @@
  <string name="TR_BUTTON_NEXT_ROUND">Start</string>
  <string name="TR_SONGS">Liedjes</string>
  <string name="TR_TEAM">Team</string>
-  <string name="TR_PLAYLIST">Afspeellijst</string>
-  <string name="TR_CATEGORY">Categorie</string>
-  <string name="TR_ALLSONGS">Alle liedjes</string>
  <string name="TR_SCREENCONFIG_TITLE">Drie-op-een-rij: configuratie</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST1">Aantal spelers in team 1</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Aantal spelers in team 2</string>
  <string name="TR_SCREENCONFIG_NUMFIELDS">Aantal vakjes</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Liedjesbron</string>
-  <string name="TR_SCREENCONFIG_GAMEMODE">Spelmodus</string>
  <string name="TR_SCREENNAMES_TITLE">Drie-op-een-rij: Kies speler</string>
  <string name="TR_SCREENNAMES_TEAM1">Team 1</string>
  <string name="TR_SCREENNAMES_TEAM2">Team 2</string>
@@ -13,15 +13,11 @@
  <string name="TR_BUTTON_NEXT_ROUND">Iniciar</string>
  <string name="TR_SONGS">Músicas</string>
  <string name="TR_TEAM">Equipa</string>
-  <string name="TR_PLAYLIST">Lista de Reprodução</string>
-  <string name="TR_CATEGORY">Categoria </string>
-  <string name="TR_ALLSONGS">Todas as Músicas</string>
  <string name="TR_SCREENCONFIG_TITLE">Jogo do Galo: Configuração</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST1">Número de Jogadores na Equipa 1 </string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Número de Jogadores na Equipa 2</string>
  <string name="TR_SCREENCONFIG_NUMFIELDS">Número de Campos</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Origem da Música</string>
-  <string name="TR_SCREENCONFIG_GAMEMODE">Modo do Jogo</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Recarregar os \"Jokers\" todas as rondas</string>
  <string name="TR_SCREENNAMES_TITLE">Jogo do Galo: Esolher Jogador</string>
  <string name="TR_SCREENNAMES_TEAM1">Equipa 1</string>
  <string name="TR_SCREENNAMES_TEAM2">Equipa 2</string>
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="language">Русский</string>
+  <string name="TR_PARTYMODE_NAME">Крестики-нолики</string>
+  <string name="TR_PARTYMODE_DESCRIPTION">Играйте в Крестики-нолики особым образом</string>
+  <string name="TR_PARTYMODE_AUDIENCE">Веселые раунды со стратегией, удачей и навыками</string>
+  <string name="TR_BUTTON_NEXT">Далее</string>
+  <string name="TR_BUTTON_BACK">Назад</string>
+  <string name="TR_BUTTON_START">Начать</string>
+  <string name="TR_BUTTON_EXIT">Выход</string>
+  <string name="TR_BUTTON_YES">Да</string>
+  <string name="TR_BUTTON_NO">Нет</string>
+  <string name="TR_BUTTON_NEXT_ROUND">Старт</string>
+  <string name="TR_SONGS">Песни</string>
+  <string name="TR_TEAM">Команда</string>
+  <string name="TR_SCREENCONFIG_TITLE">Крестики-нолики: Конфигурация</string>
+  <string name="TR_SCREENCONFIG_NUMPLAYERST1">Номер игрока из команды 1</string>
+  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Номер игрока из команды 2</string>
+  <string name="TR_SCREENCONFIG_NUMFIELDS">Количество полей</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Пополняйте джокеры каждый раунд</string>
+  <string name="TR_SCREENCONFIG_NUMJOKERS">Количество джокеров</string>
+  <string name="TR_SCREENCONFIG_SWITCH_PLAYER">Сменить игрока</string>
+  <string name="TR_SCREENNAMES_TITLE">Крестики-нолики: Выберите игрока</string>
+  <string name="TR_SCREENNAMES_SELPLAYERSTITLE">Выбранные игроки для этой команды:</string>
+  <string name="TR_SCREENNAMES_TEAM1">Команда 1</string>
+  <string name="TR_SCREENNAMES_TEAM2">Команда 2</string>
+  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Случайный выбор</string>
+  <string name="TR_SCREENMAIN_TITLE">Крестики-нолики</string>
+  <string name="TR_SCREENMAIN_TEAM_CHOOSE">Выберите поле.</string>
+  <string name="TR_SCREENMAIN_NEXT_PLAYER">Следующий игрок</string>
+  <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Действительно выйти из Крестики-нолики?</string>
+  <string name="TR_SCREENMAIN_WINNER">И победителем становится...</string>
+  <string name="TR_SCREENMAIN_NOWINNER">В этом раунде нет победителя...</string>
+</resources>
@@ -13,15 +13,10 @@
  <string name="TR_BUTTON_NEXT_ROUND">Başla</string>
  <string name="TR_SONGS">Şarkılar</string>
  <string name="TR_TEAM">Takım</string>
-  <string name="TR_PLAYLIST">Çalma Listesi</string>
-  <string name="TR_CATEGORY">Kategori</string>
-  <string name="TR_ALLSONGS">Tüm Şarkılar</string>
  <string name="TR_SCREENCONFIG_TITLE">XOX: Yapılandırma</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST1">1. takımdaki oyuncu sayısı</string>
  <string name="TR_SCREENCONFIG_NUMPLAYERST2">2. takımdaki oyuncu sayısı</string>
  <string name="TR_SCREENCONFIG_NUMFIELDS">Bölge sayısı</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Şarkı Kaynağı</string>
-  <string name="TR_SCREENCONFIG_GAMEMODE">Oyun Modu</string>
  <string name="TR_SCREENNAMES_TITLE">XOX: Oyuncu Seç</string>
  <string name="TR_SCREENNAMES_TEAM1">1. Takım</string>
  <string name="TR_SCREENNAMES_TEAM2">2. Takım</string>
@@ -2,7 +2,7 @@
 <Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <Informations>
    <ScreenName>PartyScreenTicTacToeConfig</ScreenName>
-    <ScreenVersion>2</ScreenVersion>
+    <ScreenVersion>3</ScreenVersion>
  </Informations>
  <Backgrounds>
    <Background Name="Background1">
@@ -55,7 +55,7 @@
      <Font>Outline</Font>
      <Text>TR_SCREENCONFIG_NUMFIELDS</Text>
    </Text>
-    <Text Name="TextRefillJokers">
+    <Text Name="TextNumJokers">
      <X>75</X>
      <Y>165</Y>
      <Z>0</Z>
@@ -67,8 +67,36 @@
      <ResizeAlign>Center</ResizeAlign>
      <Style>Bold</Style>
      <Font>Outline</Font>
+      <Text>TR_SCREENCONFIG_NUMJOKERS</Text>
+    </Text>
+    <Text Name="TextRefillJokers">
+      <X>75</X>
+      <Y>225</Y>
+      <Z>0</Z>
+      <H>27</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
      <Text>TR_SCREENCONFIG_REFILLJOKERS</Text>
    </Text>
+    <Text Name="TextSwitchPlayer">
+      <X>75</X>
+      <Y>285</Y>
+      <Z>0</Z>
+      <H>27</H>
+      <MaxW>0</MaxW>
+      <Color Name="TextColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENCONFIG_SWITCH_PLAYER</Text>
+    </Text>
  </Texts>
  <Buttons>
    <Button Name="ButtonNext">
@@ -187,7 +215,7 @@
      <TextStyle>Bold</TextStyle>
      <NumVisible>3</NumVisible>
    </SelectSlide>
-    <SelectSlide Name="SelectSlideRefillJokers">
+    <SelectSlide Name="SelectSlideNumJockers">
      <Skin/>
      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
@@ -227,6 +255,90 @@
      <TextMaxW>205.33</TextMaxW>
      <TextFont>Outline</TextFont>
      <TextStyle>Bold</TextStyle>
+      <NumVisible>3</NumVisible>
+    </SelectSlide>
+    <SelectSlide Name="SelectSlideRefillJokers">
+      <Skin/>
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>500</X>
+        <Y>220</Y>
+        <W>700</W>
+        <H>50</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>505</X>
+        <Y>225</Y>
+        <W>40</W>
+        <H>40</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1155</X>
+        <Y>225</Y>
+        <W>40</W>
+        <H>40</H>
+        <Z>0</Z>
+      </RectArrowRight>
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
+      <ArrowColor Name="ArrowColor" />
+      <ArrowSelColor Name="ArrowSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>27</TextH>
+      <TextRelativeX>50</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>205.33</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
+      <NumVisible>2</NumVisible>
+    </SelectSlide>
+    <SelectSlide Name="SelectSlideSwitchPlayer">
+      <Skin/>
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>500</X>
+        <Y>270</Y>
+        <W>700</W>
+        <H>50</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>505</X>
+        <Y>275</Y>
+        <W>40</W>
+        <H>40</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1155</X>
+        <Y>275</Y>
+        <W>40</W>
+        <H>40</H>
+        <Z>0</Z>
+      </RectArrowRight>
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
+      <ArrowColor Name="ArrowColor" />
+      <ArrowSelColor Name="ArrowSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>27</TextH>
+      <TextRelativeX>50</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>205.33</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
      <NumVisible>2</NumVisible>
    </SelectSlide>
  </SelectSlides>
@@ -506,6 +506,64 @@
        <Text />
      </Text>
    </Button>
+    <Button Name="ButtonSwitchPlayerT1">
+      <Skin>RepeatIcon</Skin>
+      <SkinSelected>RepeatIcon</SkinSelected>
+      <Rect>
+        <X>260</X>
+        <Y>240</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>-4</Z>
+      </Rect>
+      <Color Name="Player1" >
+        <A>0.5</A>
+      </Color>
+      <SelColor Name="Player1" />
+      <Text Name="Text">
+        <X>48</X>
+        <Y>25</Y>
+        <Z>0</Z>
+        <H>50</H>
+        <MaxW>50</MaxW>
+        <Color Name="ButtonTextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text />
+      </Text>
+    </Button>
+    <Button Name="ButtonSwitchPlayerT2">
+      <Skin>RepeatIcon</Skin>
+      <SkinSelected>RepeatIcon</SkinSelected>
+      <Rect>
+        <X>960</X>
+        <Y>240</Y>
+        <W>60</W>
+        <H>60</H>
+        <Z>-4</Z>
+      </Rect>
+      <Color Name="Player2" >
+        <A>0.5</A>
+      </Color>
+      <SelColor Name="Player2" />
+      <Text Name="Text">
+        <X>48</X>
+        <Y>25</Y>
+        <Z>0</Z>
+        <H>50</H>
+        <MaxW>50</MaxW>
+        <Color Name="ButtonTextColor" />
+        <SelColor Name="ButtonTextSelColor" />
+        <Align>Center</Align>
+        <ResizeAlign>Center</ResizeAlign>
+        <Style>Bold</Style>
+        <Font>Outline</Font>
+        <Text />
+      </Text>
+    </Button>
  </Buttons>
  <SongMenus />
  <Lyrics />
@@ -1,4 +1,4 @@
-Vocaluxe 0.4 README
+Vocaluxe 0.4.1 README
 ----------------------------

 =================================
@@ -328,6 +328,15 @@
    <NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
    <NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
    <NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
+    <RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
+    <RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
+    <RapNoteRight>RapNotesRight.png</RapNoteRight>
+    <RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
+    <RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
+    <RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
+    <RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
+    <RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
+    <RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
    <PointsBar>PointsBar.png</PointsBar>
    <PointsBarBG>PointsBarBG.png</PointsBarBG>
    <LyricHelper>LyricHelper.png</LyricHelper>
@@ -340,6 +349,7 @@
    <SearchBar>SearchBar.png</SearchBar>
    <PlaylistBG>PlaylistBG.png</PlaylistBG>
    <DuetIcon>DuetIcon.png</DuetIcon>
+    <RapIcon>RapIcon.png</RapIcon>
    <VideoIcon>VideoIcon.png</VideoIcon>
    <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
    <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
@@ -328,6 +328,15 @@
    <NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
    <NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
    <NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
+    <RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
+    <RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
+    <RapNoteRight>RapNotesRight.png</RapNoteRight>
+    <RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
+    <RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
+    <RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
+    <RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
+    <RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
+    <RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
    <PointsBar>PointsBar.png</PointsBar>
    <PointsBarBG>PointsBarBG.png</PointsBarBG>
    <LyricHelper>LyricHelper.png</LyricHelper>
@@ -340,6 +349,7 @@
    <SearchBar>SearchBar.png</SearchBar>
    <PlaylistBG>PlaylistBG.png</PlaylistBG>
    <DuetIcon>DuetIcon.png</DuetIcon>
+    <RapIcon>RapIcon.png</RapIcon>
    <VideoIcon>VideoIcon.png</VideoIcon>
    <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
    <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
@@ -328,6 +328,15 @@
    <NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
    <NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
    <NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
+    <RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
+    <RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
+    <RapNoteRight>RapNotesRight.png</RapNoteRight>
+    <RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
+    <RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
+    <RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
+    <RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
+    <RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
+    <RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
    <PointsBar>PointsBar.png</PointsBar>
    <PointsBarBG>PointsBarBG.png</PointsBarBG>
    <LyricHelper>LyricHelper.png</LyricHelper>
@@ -340,6 +349,7 @@
    <SearchBar>SearchBar.png</SearchBar>
    <PlaylistBG>PlaylistBG.png</PlaylistBG>
    <DuetIcon>DuetIcon.png</DuetIcon>
+    <RapIcon>RapIcon.png</RapIcon>
    <VideoIcon>VideoIcon.png</VideoIcon>
    <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
    <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
@@ -2,7 +2,7 @@
 <Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <Informations>
    <ScreenName>ScreenSing</ScreenName>
-    <ScreenVersion>10</ScreenVersion>
+    <ScreenVersion>11</ScreenVersion>
  </Informations>
  <Backgrounds>
    <Background Name="Background1">
@@ -694,6 +694,20 @@
      <Font>Outline</Font>
      <Text>TR_SCREENSING_PAUSE</Text>
    </Text>
+    <Text Name="TextPauseSongName">
+      <X>640</X>
+      <Y>10</Y>
+      <Z>-2.11</Z>
+      <H>40</H>
+      <MaxW>0</MaxW>
+      <Color Name="White" />
+      <SelColor Name="White" />
+      <Align>Center</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Normal</Font>
+      <Text></Text>
+    </Text>
    <Text Name="TextDuetName1">
      <X>10</X>
      <Y>55</Y>
@@ -1580,6 +1594,15 @@
      <SkinBackgroundLeft>NoteBackgroundLeft</SkinBackgroundLeft>
      <SkinBackgroundMiddle>NoteBackgroundMiddle</SkinBackgroundMiddle>
      <SkinBackgroundRight>NoteBackgroundRight</SkinBackgroundRight>
+      <SkinRapLeft>RapNoteLeft</SkinRapLeft>
+      <SkinRapMiddle>RapNoteMiddle</SkinRapMiddle>
+      <SkinRapRight>RapNoteRight</SkinRapRight>
+      <SkinRapFillLeft>RapNoteFillLeft</SkinRapFillLeft>
+      <SkinRapFillMiddle>RapNoteFillMiddle</SkinRapFillMiddle>
+      <SkinRapFillRight>RapNoteFillRight</SkinRapFillRight>
+      <SkinRapBackgroundLeft>RapNoteBackgroundLeft</SkinRapBackgroundLeft>
+      <SkinRapBackgroundMiddle>RapNoteBackgroundMiddle</SkinRapBackgroundMiddle>
+      <SkinRapBackgroundRight>RapNoteBackgroundRight</SkinRapBackgroundRight>
      <SkinGoldenStar>Star</SkinGoldenStar>
      <SkinToneHelper>ToneHelper</SkinToneHelper>
      <SkinPerfectNoteStart>Star</SkinPerfectNoteStart>
@@ -846,6 +846,7 @@
      <CoverBackground>CoverTile</CoverBackground>
      <CoverBigBackground />
      <DuetIcon>DuetIcon</DuetIcon>
+      <RapIcon>RapIcon</RapIcon>
      <VideoIcon>VideoIcon</VideoIcon>
      <MedleyCalcIcon>MedleyCalcIcon</MedleyCalcIcon>
      <MedleyTagIcon>MedleyTagIcon</MedleyTagIcon>
@@ -958,18 +959,29 @@
          <Skin>DuetIcon</Skin>
          <Color Name="StaticColor" />
          <Rect>
-            <X>200</X>
+            <X>160</X>
            <Y>530</Y>
            <W>40</W>
            <H>40</H>
            <Z>-1</Z>
          </Rect>
        </StaticDuetIcon>
+        <StaticRapIcon Name="StaticRapIcon">
+          <Skin>RapIcon</Skin>
+          <Color Name="StaticColor" />
+          <Rect>
+            <X>240</X>
+            <Y>530</Y>
+            <W>40</W>
+            <H>40</H>
+            <Z>-1</Z>
+          </Rect>
+        </StaticRapIcon>
        <StaticVideoIcon Name="StaticVideoIcon">
          <Skin>VideoIcon</Skin>
          <Color Name="StaticColor" />
          <Rect>
-            <X>120</X>
+            <X>80</X>
            <Y>530</Y>
            <W>40</W>
            <H>40</H>
@@ -980,7 +992,7 @@
          <Skin>MedleyCalcIcon</Skin>
          <Color Name="StaticColor" />
          <Rect>
-            <X>280</X>
+            <X>320</X>
            <Y>530</Y>
            <W>40</W>
            <H>40</H>
@@ -991,7 +1003,7 @@
          <Skin>MedleyTagIcon</Skin>
          <Color Name="StaticColor" />
          <Rect>
-            <X>280</X>
+            <X>320</X>
            <Y>530</Y>
            <W>40</W>
            <H>40</H>
@@ -1099,18 +1111,29 @@
          <Skin>DuetIcon</Skin>
          <Color Name="StaticColor" />
          <Rect>
-            <X>200</X>
+            <X>160</X>
            <Y>530</Y>
            <W>40</W>
            <H>40</H>
            <Z>-1</Z>
          </Rect>
        </StaticDuetIcon>
+        <StaticRapIcon Name="StaticRapIcon">
+          <Skin>RapIcon</Skin>
+          <Color Name="StaticColor" />
+          <Rect>
+            <X>240</X>
+            <Y>530</Y>
+            <W>40</W>
+            <H>40</H>
+            <Z>-1</Z>
+          </Rect>
+        </StaticRapIcon>
        <StaticVideoIcon Name="StaticVideoIcon">
          <Skin>VideoIcon</Skin>
          <Color Name="TextColor" />
          <Rect>
-            <X>120</X>
+            <X>80</X>
            <Y>530</Y>
            <W>40</W>
            <H>40</H>
@@ -1121,7 +1144,7 @@
          <Skin>MedleyCalcIcon</Skin>
          <Color Name="TextColor" />
          <Rect>
-            <X>280</X>
+            <X>320</X>
            <Y>530</Y>
            <W>40</W>
            <H>40</H>
@@ -1132,7 +1155,7 @@
          <Skin>MedleyTagIcon</Skin>
          <Color Name="StaticColor" />
          <Rect>
-            <X>280</X>
+            <X>320</X>
            <Y>530</Y>
            <W>40</W>
            <H>40</H>
@@ -104,11 +104,10 @@ namespace VocaluxeLib.PartyModes.TicTacToe
            public int NumPlayerTeam1;
            public int NumPlayerTeam2;
            public int NumFields;
+            public int NumJockers;
            public int Team;
            public List<Guid> ProfileIDsTeam1;
            public List<Guid> ProfileIDsTeam2;
-            public List<int> PlayerTeam1;
-            public List<int> PlayerTeam2;

            public ESongSource SongSource;
            public ESongSorting Sorting;
@@ -127,6 +126,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
            public int[] NumJokerRandom;
            public int[] NumJokerRetry;
            public EOffOn RefillJokers;
+            public EOffOn SwitchPlayer;
        }

        public SData GameData;
@@ -149,10 +149,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                    NumPlayerTeam1 = 2,
                    NumPlayerTeam2 = 2,
                    NumFields = 9,
+                    NumJockers = 1,
                    ProfileIDsTeam1 = new List<Guid>(),
                    ProfileIDsTeam2 = new List<Guid>(),
-                    PlayerTeam1 = new List<int>(),
-                    PlayerTeam2 = new List<int>(),
                    CurrentRoundNr = 0,
                    FieldNr = 0,
                    Sorting = CBase.Config.GetSongSorting(),
@@ -183,8 +182,6 @@ namespace VocaluxeLib.PartyModes.TicTacToe

            GameData.Songs.Clear();
            GameData.Rounds.Clear();
-            GameData.PlayerTeam1.Clear();
-            GameData.PlayerTeam2.Clear();
        }

        public override bool Init()
@@ -247,7 +244,6 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                    GameData.CurrentRoundNr = 1;
                    _CreateRounds();
                    _SetNumJokers();
-                    _PreparePlayerList(0);
                    break;
                case EStage.Main:
                    _Stage = EStage.Singing;
@@ -256,7 +252,6 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                case EStage.Singing:
                    _Stage = EStage.Main;
                    GameData.Team = GameData.Team == 1 ? 0 : 1;
-                    _UpdatePlayerList();
                    if (GameData.RefillJokers == EOffOn.TR_CONFIG_ON)
                        _SetNumJokers();
                    break;
@@ -337,101 +332,6 @@ namespace VocaluxeLib.PartyModes.TicTacToe
            }
        }

-        private void _PreparePlayerList(int team)
-        {
-            switch (team)
-            {
-                case 0:
-                    {
-                        GameData.PlayerTeam1 = new List<int>();
-                        GameData.PlayerTeam2 = new List<int>();
-
-                        //Prepare Player-IDs
-                        var ids1 = new List<int>();
-                        var ids2 = new List<int>();
-                        //Add IDs to team-list
-                        while (GameData.PlayerTeam1.Count < GameData.NumFields + GameData.NumJokerRetry[0] &&
-                               GameData.PlayerTeam2.Count < GameData.NumFields + GameData.NumJokerRetry[1])
-                        {
-                            if (ids1.Count == 0)
-                            {
-                                for (int i = 0; i < GameData.NumPlayerTeam1; i++)
-                                    ids1.Add(i);
-                            }
-                            if (ids2.Count == 0)
-                            {
-                                for (int i = 0; i < GameData.NumPlayerTeam2; i++)
-                                    ids2.Add(i);
-                            }
-                            int num;
-                            if (GameData.PlayerTeam1.Count < GameData.NumFields + GameData.NumJokerRetry[0])
-                            {
-                                num = CBase.Game.GetRandom(ids1.Count);
-                                if (num >= ids1.Count)
-                                    num = ids1.Count - 1;
-                                GameData.PlayerTeam1.Add(ids1[num]);
-                                ids1.RemoveAt(num);
-                            }
-                            if (GameData.PlayerTeam2.Count < GameData.NumFields + GameData.NumJokerRetry[1])
-                            {
-                                num = CBase.Game.GetRandom(ids2.Count);
-                                if (num >= ids2.Count)
-                                    num = ids2.Count - 1;
-                                GameData.PlayerTeam2.Add(ids2[num]);
-                                ids2.RemoveAt(num);
-                            }
-                        }
-                    }
-                    break;
-                case 1:
-                    {
-                        //Prepare Player-IDs
-                        var ids = new List<int>();
-                        //Add IDs to team-list
-                        while (GameData.PlayerTeam1.Count < GameData.NumFields + GameData.NumJokerRetry[0] && ids.Count == 0)
-                        {
-                            if (ids.Count == 0)
-                            {
-                                for (int i = 0; i < GameData.NumPlayerTeam1; i++)
-                                    ids.Add(i);
-                            }
-                            if (GameData.PlayerTeam1.Count < GameData.NumFields + GameData.NumJokerRetry[0])
-                            {
-                                int num = CBase.Game.GetRandom(ids.Count);
-                                if (num >= ids.Count)
-                                    num = ids.Count - 1;
-                                GameData.PlayerTeam1.Add(ids[num]);
-                                ids.RemoveAt(num);
-                            }
-                        }
-                    }
-                    break;
-                case 2:
-                    {
-                        //Prepare Player-IDs
-                        var ids = new List<int>();
-                        //Add IDs to team-list
-                        while (GameData.PlayerTeam2.Count < GameData.NumFields + GameData.NumJokerRetry[1] && ids.Count == 0)
-                        {
-                            if (ids.Count == 0)
-                            {
-                                for (int i = 0; i < GameData.NumPlayerTeam2; i++)
-                                    ids.Add(i);
-                            }
-                            if (GameData.PlayerTeam2.Count < GameData.NumFields + GameData.NumJokerRetry[1])
-                            {
-                                int num = CBase.Game.GetRandom(ids.Count);
-                                if (num >= ids.Count)
-                                    num = ids.Count - 1;
-                                GameData.PlayerTeam2.Add(ids[num]);
-                                ids.RemoveAt(num);
-                            }
-                        }
-                    }
-                    break;
-            }
-        }
-
        public void UpdateSongList()
        {
            if (GameData.Songs.Count > 0)
@@ -465,14 +365,6 @@ namespace VocaluxeLib.PartyModes.TicTacToe
            GameData.Songs.Shuffle();
        }

-        private void _UpdatePlayerList()
-        {
-            if (GameData.PlayerTeam1.Count == 0)
-                _PreparePlayerList(1);
-            if (GameData.PlayerTeam2.Count == 0)
-                _PreparePlayerList(2);
-        }
-
        private void _StartRound(int roundNr)
        {
            CBase.Game.Reset();
@@ -505,25 +397,23 @@ namespace VocaluxeLib.PartyModes.TicTacToe

        private void _SetNumJokers()
        {
+
+            GameData.NumJokerRandom[0] = GameData.NumJockers;
+            GameData.NumJokerRandom[1] = GameData.NumJockers;
+
            switch (GameData.NumFields)
            {
                case 9:
-                    GameData.NumJokerRandom[0] = 1;
-                    GameData.NumJokerRandom[1] = 1;
                    GameData.NumJokerRetry[0] = 0;
                    GameData.NumJokerRetry[1] = 0;
                    break;

                case 16:
-                    GameData.NumJokerRandom[0] = 2;
-                    GameData.NumJokerRandom[1] = 2;
                    GameData.NumJokerRetry[0] = 1;
                    GameData.NumJokerRetry[1] = 1;
                    break;

                case 25:
-                    GameData.NumJokerRandom[0] = 3;
-                    GameData.NumJokerRandom[1] = 3;
                    GameData.NumJokerRetry[0] = 2;
                    GameData.NumJokerRetry[1] = 2;
                    break;
@@ -26,16 +26,19 @@ namespace VocaluxeLib.PartyModes.TicTacToe
 {
    // ReSharper disable UnusedMember.Global
    public class CPartyScreenTicTacToeConfig : CPartyScreenTicTacToe
-        // ReSharper restore UnusedMember.Global
+    // ReSharper restore UnusedMember.Global
    {
        // Version number for theme files. Increment it, if you've changed something on the theme files!
        protected override int _ScreenVersion
        {
-            get { return 2; }
+            get { return 3; }
        }

        private const string _SelectSlideNumFields = "SelectSlideNumFields";
+        private const string _SelectSlideNumJockers = "SelectSlideNumJockers";
        private const string _SelectSlideRefillJokers = "SelectSlideRefillJokers";
+        private const string _SelectSlideNumJokers = "SelectSlideNumJokers";
+        private const string _SelectSlideSwitchPlayer = "SelectSlideSwitchPlayer";

        private const string _ButtonNext = "ButtonNext";
        private const string _ButtonBack = "ButtonBack";
@@ -46,15 +49,15 @@ namespace VocaluxeLib.PartyModes.TicTacToe
        {
            base.Init();

-            _ThemeSelectSlides = new string[] { _SelectSlideNumFields };
-            _ThemeButtons = new string[] {_ButtonNext, _ButtonBack};
+            _ThemeSelectSlides = new string[] { _SelectSlideNumFields, _SelectSlideNumJokers, _SelectSlideRefillJokers, _SelectSlideSwitchPlayer };
+            _ThemeButtons = new string[] { _ButtonNext, _ButtonBack };
        }

        public override bool HandleInput(SKeyEvent keyEvent)
        {
            base.HandleInput(keyEvent);

-            if (keyEvent.KeyPressed) {}
+            if (keyEvent.KeyPressed) { }
            else
            {
                switch (keyEvent.Key)
@@ -131,14 +134,25 @@ namespace VocaluxeLib.PartyModes.TicTacToe

            _SelectSlides[_SelectSlideNumFields].SelectedTag = _PartyMode.GameData.NumFields;

+            _SelectSlides[_SelectSlideNumJockers].Clear();
+            for (int i = 0; i <= 3; i++)
+                _SelectSlides[_SelectSlideNumJockers].AddValue(i);
+
+            _SelectSlides[_SelectSlideNumJockers].SelectedTag = _PartyMode.GameData.NumJockers;
+
            _SelectSlides[_SelectSlideRefillJokers].AddValues(Enum.GetNames(typeof(EOffOn)));
            _SelectSlides[_SelectSlideRefillJokers].Selection = (int)_PartyMode.GameData.RefillJokers;
+
+            _SelectSlides[_SelectSlideSwitchPlayer].AddValues(Enum.GetNames(typeof(EOffOn)));
+            _SelectSlides[_SelectSlideSwitchPlayer].Selection = (int)_PartyMode.GameData.SwitchPlayer;
        }

        private void _UpdateSlides()
        {
            _PartyMode.GameData.NumFields = _SelectSlides[_SelectSlideNumFields].SelectedTag;
+            _PartyMode.GameData.NumJockers = _SelectSlides[_SelectSlideNumJockers].Selection;
            _PartyMode.GameData.RefillJokers = (EOffOn)_SelectSlides[_SelectSlideRefillJokers].Selection;
+            _PartyMode.GameData.SwitchPlayer = (EOffOn)_SelectSlides[_SelectSlideSwitchPlayer].Selection;
        }
    }
 }
@@ -17,6 +17,7 @@

 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using VocaluxeLib.Menu;
 using VocaluxeLib.Songs;
@@ -33,7 +34,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe

    // ReSharper disable UnusedMember.Global
    public class CPartyScreenTicTacToeMain : CPartyScreenTicTacToe
-        // ReSharper restore UnusedMember.Global
+    // ReSharper restore UnusedMember.Global
    {
        // Version number for theme files. Increment it, if you've changed something on the theme files!
        protected override int _ScreenVersion
@@ -60,6 +61,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
        private const string _ButtonJokerRandomT2 = "ButtonJokerRandomT2";
        private const string _ButtonJokerRetryT1 = "ButtonJokerRetryT1";
        private const string _ButtonJokerRetryT2 = "ButtonJokerRetryT2";
+        private const string _ButtonSwitchPlayerT1 = "ButtonSwitchPlayerT1";
+        private const string _ButtonSwitchPlayerT2 = "ButtonSwitchPlayerT2";

        private const string _StaticPopupBG = "StaticPopupBG";
        private const string _StaticAvatarT1 = "StaticAvatarT1";
@@ -78,6 +81,12 @@ namespace VocaluxeLib.PartyModes.TicTacToe
        private const int _FieldSpace = 10;
        private float _FieldSize = 100;

+        private int idPlayer1 = 0;
+        private int idPlayer2 = 0;
+
+        private static readonly Random random = new Random();
+        private static readonly object syncLock = new object();
+
        private int _OldSelectedField = -1;

        private int[,] _Possibilities;
@@ -92,9 +101,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
            _ThemeButtons = new string[]
                {
                    _ButtonNextRound, _ButtonBack, _ButtonExit, _ButtonPopupYes, _ButtonPopupNo, _ButtonField, _ButtonJokerRandomT1, _ButtonJokerRandomT2, _ButtonJokerRetryT1,
-                    _ButtonJokerRetryT2
+                    _ButtonJokerRetryT2, _ButtonSwitchPlayerT1, _ButtonSwitchPlayerT2
                };
-            _ThemeStatics = new string[] {_StaticPopupBG, _StaticAvatarT1, _StaticAvatarT2, _StaticTeam1, _StaticTeam2};
+            _ThemeStatics = new string[] { _StaticPopupBG, _StaticAvatarT1, _StaticAvatarT2, _StaticTeam1, _StaticTeam2 };

            var texts = new List<string>();
            texts.AddRange(_EqualizerTeam);
@@ -116,7 +125,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
        {
            base.HandleInput(keyEvent);

-            if (keyEvent.KeyPressed) {}
+            if (keyEvent.KeyPressed) { }
            else
            {
                switch (keyEvent.Key)
@@ -178,6 +187,10 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                                    _UseJoker(0, 1);
                                if (_Buttons[_ButtonJokerRetryT2].Selected)
                                    _UseJoker(1, 1);
+                                if (_Buttons[_ButtonSwitchPlayerT1].Selected)
+                                    _ChangePlayer(0, true);
+                                if (_Buttons[_ButtonSwitchPlayerT2].Selected)
+                                    _ChangePlayer(1, true);
                            }
                        }
                        else
@@ -243,6 +256,10 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                            _UseJoker(0, 1);
                        if (_Buttons[_ButtonJokerRetryT2].Selected)
                            _UseJoker(1, 1);
+                        if (_Buttons[_ButtonSwitchPlayerT1].Selected)
+                            _ChangePlayer(0, true);
+                        if (_Buttons[_ButtonSwitchPlayerT2].Selected)
+                            _ChangePlayer(1, true);
                    }
                }
                else
@@ -269,7 +286,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                    _ShowPopup(false);
            }

-            if (mouseEvent.Wheel != 0) {}
+            if (mouseEvent.Wheel != 0) { }

            return true;
        }
@@ -323,6 +340,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                _Buttons[_ButtonJokerRandomT2].Visible = false;
                _Buttons[_ButtonJokerRetryT1].Visible = false;
                _Buttons[_ButtonJokerRetryT2].Visible = false;
+                _Buttons[_ButtonSwitchPlayerT1].Visible = false;
+                _Buttons[_ButtonSwitchPlayerT2].Visible = false;
                _Buttons[_ButtonNextRound].Visible = false;
                _Texts[_TextFinishMessage].Visible = false;
            }
@@ -357,9 +376,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
            for (int i = 0; i < 2; i++)
            {
                CBase.Record.AnalyzeBuffer(i);
-                _Equalizers["EqualizerTeam" + (i+1)].Update(CBase.Record.ToneWeigth(i), CBase.Record.GetMaxVolume(i));
+                _Equalizers["EqualizerTeam" + (i + 1)].Update(CBase.Record.ToneWeigth(i), CBase.Record.GetMaxVolume(i));
            }
-        
+
            return true;
        }

@@ -453,38 +472,22 @@ namespace VocaluxeLib.PartyModes.TicTacToe
        {
            if (!jokerUsed)
            {
-                int singerTeam1 = 0;
-                int singerTeam2 = 0;
-
-                if (_PartyMode.GameData.PlayerTeam1.Count > 0)
-                {
-                    singerTeam1 = _PartyMode.GameData.PlayerTeam1[0];
-                    _PartyMode.GameData.PlayerTeam1.RemoveAt(0);
-                }
-
-                if (_PartyMode.GameData.PlayerTeam2.Count > 0)
-                {
-                    singerTeam2 = _PartyMode.GameData.PlayerTeam2[0];
-                    _PartyMode.GameData.PlayerTeam2.RemoveAt(0);
-                }
-                _PartyMode.GameData.Rounds[_PartyMode.GameData.FieldNr].SingerTeam1 = singerTeam1;
-                _PartyMode.GameData.Rounds[_PartyMode.GameData.FieldNr].SingerTeam2 = singerTeam2;
-
-                _UpdatePlayerInformation();
+                _ChangePlayer();
            }
            _PartyMode.UpdateSongList();
            int[] songIDs = new int[_PartyMode.GameData.GameMode == EGameMode.TR_GAMEMODE_MEDLEY ? _PartyMode.GameData.NumMedleySongs : 1];
-            for(int i = 0; i < songIDs.Length; i++)
+            for (int i = 0; i < songIDs.Length; i++)
            {
                songIDs[i] = _PartyMode.GameData.Songs[0];
                _PartyMode.GameData.Songs.RemoveAt(0);
-            }  
+            }

            _StartPreview(songIDs[0]);
            _Status = EStatus.FieldSelected;
            _PartyMode.GameData.Rounds[_PartyMode.GameData.FieldNr].SongIDs = songIDs;
            _UpdateFieldContents();
            _UpdateJokerButtons();
+            _UpdateSwitchPlayerButtons();

            _Buttons[_ButtonNextRound].Visible = true;
            _Buttons[_ButtonExit].Visible = true;
@@ -519,6 +522,49 @@ namespace VocaluxeLib.PartyModes.TicTacToe
            CBase.BackgroundMusic.LoadPreview(song);
        }

+        private int _GetRamdom(int max)
+        {
+            lock (syncLock)
+            { 
+                return random.Next(max+1);
+            }
+        }
+
+        private void _ChangePlayer(int teamNr = -1, bool next = false)
+        {
+
+            if (_PartyMode.GameData.ProfileIDsTeam1.Count > 0 && (teamNr == 0 || teamNr == -1))
+            {
+                idPlayer1 = _GetTeamPlayer(idPlayer1, _PartyMode.GameData.ProfileIDsTeam1.Count, next);
+                _PartyMode.GameData.Rounds[_PartyMode.GameData.FieldNr].SingerTeam1 = idPlayer1;
+            }
+
+            if (_PartyMode.GameData.ProfileIDsTeam2.Count > 0 && (teamNr == 1 || teamNr == -1))
+            {
+                idPlayer2 = _GetTeamPlayer(idPlayer2, _PartyMode.GameData.ProfileIDsTeam2.Count, next);
+                _PartyMode.GameData.Rounds[_PartyMode.GameData.FieldNr].SingerTeam2 = idPlayer2;
+            }
+
+            _UpdatePlayerInformation();
+        }
+
+        private int _GetTeamPlayer(int idPlayer, int teamCount, bool next)
+        {
+            if (next)
+            {
+                idPlayer++;
+                if (idPlayer >= _PartyMode.GameData.ProfileIDsTeam1.Count)
+                {
+                    idPlayer = 0;
+                }
+            }
+            else
+            {
+                idPlayer = _GetRamdom(_PartyMode.GameData.ProfileIDsTeam1.Count - 1);
+            }
+            return idPlayer;
+        }
+
        private void _UpdatePlayerInformation()
        {
            _Texts[_TextNextPlayerT1].Visible = true;
@@ -543,7 +589,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
        {
            switch (jokerNum)
            {
-                    //Random-Joker
+                //Random-Joker
                case 0:
                    if (_PartyMode.GameData.NumJokerRandom[teamNr] > 0)
                    {
@@ -552,7 +598,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                    }
                    break;

-                    //Retry-Joker
+                //Retry-Joker
                case 1:
                    if (_PartyMode.GameData.NumJokerRetry[teamNr] > 0 && _PartyMode.GameData.CurrentRoundNr > 1)
                    {
@@ -596,6 +642,16 @@ namespace VocaluxeLib.PartyModes.TicTacToe
            _Buttons[_ButtonJokerRetryT2].Selectable = _PartyMode.GameData.NumJokerRetry[1] > 0 && _PartyMode.GameData.CurrentRoundNr > 1;
        }

+        private void _UpdateSwitchPlayerButtons()
+        {
+            if (_PartyMode.GameData.SwitchPlayer == EOffOn.TR_CONFIG_ON)
+            {
+                _Buttons[_ButtonSwitchPlayerT1].Visible = true;
+                _Buttons[_ButtonSwitchPlayerT2].Visible = true;
+            }
+
+        }
+
        private void _NextRound()
        {
            _PartyMode.Next();
@@ -627,7 +683,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
        private void _BuildWinnerPossibilities()
        {
            var numOneRow = (int)Math.Sqrt(_PartyMode.GameData.NumFields);
-            _Possibilities = new int[(numOneRow * 2) + 2,numOneRow];
+            _Possibilities = new int[(numOneRow * 2) + 2, numOneRow];
            for (int i = 0; i < _Possibilities.GetLength(0); i++)
            {
                if (i < numOneRow)
@@ -17,6 +17,7 @@

 using System;
 using System.Collections.Generic;
+using System.Linq;
 using VocaluxeLib.Menu;

 namespace VocaluxeLib.PartyModes.TicTacToe
@@ -76,11 +77,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                _PartyMode.GameData.ProfileIDsTeam1 = _TeamList[0];
                _PartyMode.GameData.ProfileIDsTeam2 = _TeamList[1];
            }
-            if (_NumPlayerTeams.Length == 2)
-            {
-                _PartyMode.GameData.NumPlayerTeam1 = _NumPlayerTeams[0];
-                _PartyMode.GameData.NumPlayerTeam2 = _NumPlayerTeams[1];
-            }
+            _PartyMode.GameData.NumPlayerTeam1 = _PartyMode.GameData.ProfileIDsTeam1.Count;
+            _PartyMode.GameData.NumPlayerTeam2 = _PartyMode.GameData.ProfileIDsTeam2.Count;
+
            _PartyMode.Next();
        }
    }
@@ -371,6 +371,38 @@ namespace Tests.VocaluxeLib.XML
 </root>", newXml);
        }

+        [Test]
+        public void TestEscapedValues()
+        {
+            const string s = _Head + @"<root>
+  <S>Foo\'Bar</S>
+  <Sub>
+    <S>Foo\'Bar</S>
+  </Sub>
+</root>";
+            _AssertSerDeserMatch<SUnescaping>(s);
+            var xml = new CXmlDeserializer(new CXmlErrorHandler(exception => { }));
+            SUnescaping foo = xml.DeserializeString<SUnescaping>(@"<root />");
+            Assert.AreEqual(foo.S, "Foo\'Bar");
+            Assert.AreEqual(foo.Sub.S, "Foo\'Bar");
+        }
+
+        [Test]
+        public void TestUnescapedValues()
+        {
+            const string s = _Head + @"<root>
+  <S>Foo\'Bar</S>
+  <Sub>
+    <S>Foo\'Bar</S>
+  </Sub>
+</root>";
+            _AssertSerDeserMatch<SUnescaping>(s);
+            var xml = new CXmlDeserializer(new CXmlErrorHandler(exception => { }), true);
+            SUnescaping foo = xml.DeserializeString<SUnescaping>(@"<root />");
+            Assert.AreEqual(foo.S, "Foo'Bar");
+            Assert.AreEqual(foo.Sub.S, "Foo'Bar");
+        }
+
        [Test]
        public void TestRealFiles([Values(typeof(SThemeCover), typeof(CConfig.SConfig), /*typeof(SThemeScreen),*/ typeof(SDefaultFonts), typeof(SSkin), typeof(STheme), typeof(Dictionary<string, string>))] Type type)
        {
@@ -491,6 +523,20 @@ namespace Tests.VocaluxeLib.XML
            public SDefaultSub Sub;
        }

+        private struct SUnescaping
+        {
+            [DefaultValue("Foo\'Bar")]
+            public string S;
+            public SUnescapingSub Sub;
+        }
+
+        private struct SUnescapingSub
+        {
+            [DefaultValue("Foo\'Bar")]
+            public string S;
+        }
+
+
 #pragma warning restore 169
 #pragma warning restore 649

@@ -302,6 +302,9 @@ namespace Vocaluxe.Base
                            if(p == 0) tonePlayer = tone;
 #endif

+                        if (notes[note].Type == ENoteType.Rap || notes[note].Type == ENoteType.RapGolden)
+                            tonePlayer = tone;
+
                        Players[p].NoteDiff = Math.Abs(tone - tonePlayer);
                        bool hit = Players[p].NoteDiff <= (2 - (int)CProfiles.GetDifficulty(Players[p].ProfileID));

@@ -311,7 +314,7 @@ namespace Vocaluxe.Base
                            //CRecord.RecordSetTone(p, Tone);
                            double points = (CSettings.MaxScore - CSettings.LinebonusScore) * (double)notes[note].PointsForBeat /
                                            song.Notes.GetVoice(Players[p].VoiceNr).Points;
-                            if (notes[note].Type == ENoteType.Golden)
+                            if (notes[note].Type == ENoteType.Golden || notes[note].Type == ENoteType.RapGolden)
                                Players[p].PointsGoldenNotes += points;

                            Players[p].Points += points;
@@ -411,7 +414,7 @@ namespace Vocaluxe.Base
                    {
                        if (note.StartBeat < nextStart)
                        {
-                            if (note.Hit && note.HitNote.Type == ENoteType.Golden)
+                            if (note.Hit && (note.HitNote.Type == ENoteType.Golden || note.HitNote.Type == ENoteType.RapGolden))
                                Players[p].PointsGoldenNotes += note.Points;
                            Players[p].Points += note.Points;
                        }
@@ -421,7 +424,7 @@ namespace Vocaluxe.Base
                    }
                    while (line.NoteCount > n && n >= 0)
                    {
-                        if (line.Notes[n].Hit && line.Notes[n].HitNote.Type == ENoteType.Golden)
+                        if (line.Notes[n].Hit && (line.Notes[n].HitNote.Type == ENoteType.Golden || line.Notes[n].HitNote.Type == ENoteType.RapGolden))
                            Players[p].PointsGoldenNotes -= line.Notes[n].Points;
                        Players[p].Points -= line.Notes[n].Points;
                        line.DeleteNote(n);
@@ -161,7 +161,7 @@ namespace Vocaluxe.Base

        private static bool _LoadLanguageEntries(string filePath, out Dictionary<string, string> texts)
        {
-            var deser = new CXmlDeserializer();
+            var deser = new CXmlDeserializer(true);
            try
            {
                texts = deser.Deserialize<Dictionary<string, string>>(filePath);
@@ -41,7 +41,7 @@ namespace Vocaluxe.Screens
        // Version number for theme files. Increment it, if you've changed something on the theme files!
        protected override int _ScreenVersion
        {
-            get { return 10; }
+            get { return 11; }
        }

        private struct STimeRect
@@ -57,6 +57,7 @@ namespace Vocaluxe.Screens
        private const string _TextDuetName1 = "TextDuetName1";
        private const string _TextDuetName2 = "TextDuetName2";
        private const string _TextMedleyCountdown = "TextMedleyCountdown";
+        private const string _TextPauseSongName = "TextPauseSongName";
        private string[,,] _TextScores;
        private string[,,] _TextNames;
        private List<string> _TextsPause;
@@ -1114,6 +1115,13 @@ namespace Vocaluxe.Screens
            _Buttons[_ButtonRestartGame].Visible = _Pause;
            _Buttons[_ButtonRestartRound].Visible = _Pause && CGame.NumRounds > 1;

+            if (_Pause && _TimerSongText.IsRunning)            
+                _TimerSongText.Stop();
+            else            
+                _TimerSongText.Start();
+
+            _Texts[_TextSongName].Visible = !_Pause;
+
            if (_Pause)
                CSound.Pause(_CurrentStream);
            else
@@ -1149,6 +1157,7 @@ namespace Vocaluxe.Screens
            if (rounds > 1)
                songname += " (" + CGame.RoundNr + "/" + rounds + ")";
            _Texts[_TextSongName].Text = songname;
+            _Texts[_TextPauseSongName].Text = songname;

            _CurrentStream = CSound.Load(song.GetMP3(), false, true, CConfig.Config.Sound.KaraokeEffect == EOffOn.TR_CONFIG_ON ? EAudioEffect.Karaoke : EAudioEffect.None);
            CSound.SetStreamVolume(_CurrentStream, 100);
@@ -77,10 +77,10 @@
    "discoverConnectButton": "Připojit se",
    "Checking...": "Ověřuje se...",
    "timeout": "Překročení časového omezení",
-    "keyboardButtonShift": "Shift",
-    "keyboardButtonAlt": "Alt",
+    "keyboardButtonShift":  "Shift",
+    "keyboardButtonAlt":  "Alt",
    "keyboardButtonCtrl": "Ctrl",
    "keyboardButtonBackspace": "Backspace",
    "keyboardAutoSend": "Poslat klávesy automaticky",
-    "keyboardButtonSend": "Poslat"
+    "keyboardButtonSend":  "Poslat"
 }
@@ -15,7 +15,7 @@
    "mainPageSelectProfile": "Profile",
    "mainPageSelectProfileDesc": "Listet alle Profile auf",
    "mainPageTakePhotoLink": "Nehme Foto auf",
-    "mainPageTakePhotoLinkDesc": "Nimmt ein Foto auf und zeige es am Ende der Runde an",
+    "mainPageTakePhotoLinkDesc": "Nimmt ein Foto auf und zeigt es am ende der Runde an",
    "mainPageKeyboard": "Tastatur",
    "mainPageKeyboardDesc": "Sende Tastatureingaben",
    "mainPageSelectUserAdmin": "Administration",
@@ -77,10 +77,10 @@
    "discoverConnectButton": "Verbinden",
    "Checking...": "Prüfen...",
    "timeout": "Zeitüberschreitung",
-    "keyboardButtonShift": "Shift",
-    "keyboardButtonAlt": "Alt",
+    "keyboardButtonShift":  "Shift",
+    "keyboardButtonAlt":  "Alt",
    "keyboardButtonCtrl": "Steuerung",
    "keyboardButtonBackspace": "Backspace",
    "keyboardAutoSend": "Automatisch Tasten senden",
-    "keyboardButtonSend": "Senden"
+    "keyboardButtonSend":  "Senden"
 }
@@ -77,10 +77,10 @@
    "discoverConnectButton": "Conectar",
    "Checking...": "Comprobando...",
    "timeout": "Tiempo de espera",
-    "keyboardButtonShift": "Shift",
-    "keyboardButtonAlt": "Alt",
+    "keyboardButtonShift":  "Shift",
+    "keyboardButtonAlt":  "Alt",
    "keyboardButtonCtrl": "Control",
    "keyboardButtonBackspace": "Retroceso",
    "keyboardAutoSend": "Auto-enviar teclas.",
-    "keyboardButtonSend": "Mandar"
+    "keyboardButtonSend":  "Mandar"
 }
@@ -77,10 +77,10 @@
    "discoverConnectButton": "Connecter",
    "Checking...": "Vérification",
    "timeout": "Temps dépassé",
-    "keyboardButtonShift": "Maj.",
-    "keyboardButtonAlt": "Alt",
+    "keyboardButtonShift":  "Maj.",
+    "keyboardButtonAlt":  "Alt",
    "keyboardButtonCtrl": "Controle",
    "keyboardButtonBackspace": "Retour",
    "keyboardAutoSend": "Envoyer la saisie automatiquement",
-    "keyboardButtonSend": "Envoyer"
+    "keyboardButtonSend":  "Envoyer"
 }
@@ -77,10 +77,10 @@
    "discoverConnectButton": "Kapcsolódás",
    "Checking...": "Ellenőrzés...",
    "timeout": "Időtúllépés",
-    "keyboardButtonShift": "Shift",
-    "keyboardButtonAlt": "Alt",
+    "keyboardButtonShift":  "Shift",
+    "keyboardButtonAlt":  "Alt",
    "keyboardButtonCtrl": "Ctrl",
    "keyboardButtonBackspace": "Backspace",
    "keyboardAutoSend": "Billentyűleütések automatikus küldése",
-    "keyboardButtonSend": "Küldés"
+    "keyboardButtonSend":  "Küldés"
 }
@@ -77,10 +77,10 @@
    "discoverConnectButton": "Connetti",
    "Checking...": "Controllo...",
    "timeout": "Timeout",
-    "keyboardButtonShift": "Shift",
-    "keyboardButtonAlt": "Alt",
+    "keyboardButtonShift":  "Shift",
+    "keyboardButtonAlt":  "Alt",
    "keyboardButtonCtrl": "Control",
    "keyboardButtonBackspace": "Backspace",
-    "keyboardAutoSend": "Auto send keys",
-    "keyboardButtonSend": "Send"
+    "keyboardAutoSend": "Tasti auto invio",
+    "keyboardButtonSend":  "Invia"
 }
@@ -77,10 +77,10 @@
    "discoverConnectButton": "Verbinden",
    "Checking...": "Controleren...",
    "timeout": "Timeout",
-    "keyboardButtonShift": "Shift",
-    "keyboardButtonAlt": "Alt",
+    "keyboardButtonShift":  "Shift",
+    "keyboardButtonAlt":  "Alt",
    "keyboardButtonCtrl": "Control",
    "keyboardButtonBackspace": "Backspace",
    "keyboardAutoSend": "Stuur toetsen automatisch",
-    "keyboardButtonSend": "Verzenden"
+    "keyboardButtonSend":  "Verzenden"
 }
@@ -77,10 +77,10 @@
    "discoverConnectButton": "Ligar",
    "Checking...": "A verificar...",
    "timeout": "Tempo de espera excedido",
-    "keyboardButtonShift": "Shift",
-    "keyboardButtonAlt": "Alt",
+    "keyboardButtonShift":  "Shift",
+    "keyboardButtonAlt":  "Alt",
    "keyboardButtonCtrl": "Control",
    "keyboardButtonBackspace": "Backspace",
    "keyboardAutoSend": "Enviar teclas automáticamente",
-    "keyboardButtonSend": "Enviar"
+    "keyboardButtonSend":  "Enviar"
 }
@@ -0,0 +1,86 @@
+{
+    "loginName": "Пользователь:",
+    "loginPassword": "Пароль:",
+    "loginButton": "Логин",
+    "registerButton": "Создать профиль",
+    "discoverReadQrButton": "Сканировать QR-код",
+    "mainPageYourProfileLink": "Ваш профиль",
+    "mainPageYourProfileLinkDesc": "Редактировать ваш профиль",
+    "mainPageCurrentSongLink": "Текущая песня",
+    "mainPageCurrentSongLinkDesc": "Отображение информации о текущей песне",
+    "mainPageSelectSong": "Все песни",
+    "mainPageSelectSongDesc": "Список всех доступных песен",
+    "mainPageSelectPlaylist": "Все плейлисты",
+    "mainPageSelectPlaylistDesc": "Список всех плейлистов",
+    "mainPageSelectProfile": "Профили",
+    "mainPageSelectProfileDesc": "Показать все профили",
+    "mainPageTakePhotoLink": "Выбрать Фото",
+    "mainPageTakePhotoLinkDesc": "Выбрать фотографию и отображать ее в конце текущего раунда",
+    "mainPageKeyboard": "Клавиатура",
+    "mainPageKeyboardDesc": "Отправить ключи",
+    "mainPageSelectUserAdmin": "Администрирование",
+    "mainPageSelectUserAdminDesc": "Настроить права пользователя",
+    "mainPageLogoutLink": "Выход из системы",
+    "mainPageLogoutLinkDesc": "Закрыть сессию",
+    "selectProfileHeader": "Все профили",
+    "displayProfileHeader": "Профиль",
+    "displayProfileName": "Имя:",
+    "displayProfilePlayerType": "Тип Игрока:",
+    "displayProfilePlayerTypeNormal": "Обычный",
+    "displayProfilePlayerTypeGuest": "Гость",
+    "displayProfilePlayerDifficulty": "Сложность:",
+    "displayProfilePlayerDifficultyEasy": "Легко",
+    "displayProfilePlayerDifficultyNormal": "Нормально",
+    "displayProfilePlayerDifficultyHard": "Сложно",
+    "displayProfilePlayerPassword": "Новый Пароль:",
+    "displayProfilePlayerSaveButton": "Сохранить и загрузить",
+    "displaySongHeader": "Нет текущей песни",
+    "displaySongArtist": "Артист:",
+    "displaySongGenre": "Жанр:",
+    "displaySongYear": "Год:",
+    "displaySongLanguage": "Язык:",
+    "displaySongIsDuet": "Дуэт:",
+    "popupVideoClose": "Закрыть",
+    "selectSongHeader": "Все песни",
+    "keyboardHeader": "Клавиатура",
+    "keyboardButtonUp": "вверх",
+    "keyboardButtonLeft": "влево",
+    "keyboardButtonRight": "вправо",
+    "keyboardButtonDown": "вниз",
+    "keyboardButtonEscape": "escape",
+    "keyboardButtonTab": "tab",
+    "keyboardButtonReturn": "return",
+    "keyboardButtonKeys": "Чтобы отправить другие ключи введите здесь:",
+    "selectUserAdminHeader": "Все профили",
+    "displayUserAdminHeader": "Профиль",
+    "displayUserAdminContentSaveButton": "Сохранить",
+    "selectPlaylistHeader": "Выборать из плейлиста",
+    "displayPlaylistHeader": "Плейлист",
+    "displayPlaylistSaveButton": "Сохранить",
+    "selectPlaylistAddPlaylistButton": "Добавить",
+    "Loading (external)...": "Загрузка (внешняя)...",
+    "Loading...": "Загрузка...",
+    "Creating...": "Создание...",
+    "Error...": "Ошибка...",
+    "No connection": "Нет соединения",
+    "No session": "Нет сеанса",
+    "Uploading photo...": "Загрузка фото..",
+    "Getting current song...": "Получение текущей песни...",
+    "Login...": "Логин...",
+    "Creating profile...": "Создание профиля...",
+    "This is not a valid name.": "Это неверное имя.",
+    "Uploading profile...": "Загрузка профиля...",
+    "songs": "песни",
+    "YourName": "Ваше имя",
+    "discoverConnectHeader": "Подключиться к серверу",
+    "discoverConnectServerAddress": "Адрес сервера:",
+    "discoverConnectButton": "Соединение",
+    "Checking...": "Проверка...",
+    "timeout": "Время ожидания",
+    "keyboardButtonShift":  "Shift",
+    "keyboardButtonAlt":  "Alt",
+    "keyboardButtonCtrl": "Control",
+    "keyboardButtonBackspace": "Backspace",
+    "keyboardAutoSend": "Автоматическая отправка ключей",
+    "keyboardButtonSend":  "Отправить"
+}
@@ -77,10 +77,10 @@
    "discoverConnectButton": "Anslut",
    "Checking...": "Kontrollerar...",
    "timeout": "Timeout",
-    "keyboardButtonShift": "Skift",
-    "keyboardButtonAlt": "Alt",
+    "keyboardButtonShift":  "Skift",
+    "keyboardButtonAlt":  "Alt",
    "keyboardButtonCtrl": "Ctrl",
    "keyboardButtonBackspace": "Backsteg",
    "keyboardAutoSend": "Autoskicka knappar",
-    "keyboardButtonSend": "Skicka"
+    "keyboardButtonSend":  "Skicka"
 }
@@ -77,10 +77,10 @@
    "discoverConnectButton": "Bağlan",
    "Checking...": "Kontrol ediliyor...",
    "timeout": "Zaman aşımı",
-    "keyboardButtonShift": "Shift",
-    "keyboardButtonAlt": "Alt",
+    "keyboardButtonShift":  "Shift",
+    "keyboardButtonAlt":  "Alt",
    "keyboardButtonCtrl": "Control",
    "keyboardButtonBackspace": "Backspace",
    "keyboardAutoSend": "Auto send keys",
-    "keyboardButtonSend": "Send"
+    "keyboardButtonSend":  "Send"
 }
@@ -366,7 +366,9 @@ namespace VocaluxeLib
    {
        Normal,
        Golden,
-        Freestyle
+        Freestyle,
+        Rap,
+        RapGolden
    }

    public enum EMusicType
@@ -84,7 +84,7 @@ namespace VocaluxeLib.Menu.SingNotes
            _Flares.Clear();
            _PerfectNoteEffect.Clear();

-            foreach (CSongNote note in _Lines[_CurrentLine].Notes.Where(note => note.Type == ENoteType.Golden))
+            foreach (CSongNote note in _Lines[_CurrentLine].Notes.Where(note => (note.IsGoldenNote)))
                _AddGoldenNote(_GetNoteRect(note));
        }

@@ -109,8 +109,8 @@ namespace VocaluxeLib.Menu.SingNotes
                {
                    SRectF rect = _GetNoteRect(note);

-                    _DrawNoteBG(rect, color);
-                    _DrawNoteBase(rect, new SColorF(_NoteBaseColor, _NoteBaseColor.A * Alpha), 1f);
+                    _DrawNoteBG(rect, color, note.IsRapNote);
+                    _DrawNoteBase(rect, new SColorF(_NoteBaseColor, _NoteBaseColor.A * Alpha), 1f, note.IsRapNote);
                }
            }

@@ -128,9 +128,9 @@ namespace VocaluxeLib.Menu.SingNotes

                    float factor = (note.Hit) ? 1f : 0.6f;

-                    _DrawNoteFill(rect, color, factor);
+                    _DrawNoteFill(rect, color, factor, note.IsRapNote);

-                    if (note.EndBeat >= CBase.Game.GetRecordedBeat() && note.Hit && note.HitNote.Type == ENoteType.Golden)
+                    if (note.EndBeat >= CBase.Game.GetRecordedBeat() && note.Hit && note.IsGoldenNote)
                    {
                        SRectF re = rect;
                        re.W = (CBase.Game.GetMidRecordedBeat() - note.StartBeat) / beats * Rect.W;
@@ -175,14 +175,22 @@ namespace VocaluxeLib.Menu.SingNotes
        {
            CSongLine line = _Lines[_CurrentLine];
            float beats = line.LastNoteBeat - line.FirstNoteBeat + 1;
+            bool isRapNote = note.IsRapNote;

            float width = note.Duration * Rect.W / beats;
+            float y = Rect.Y + (CBase.Settings.GetNumNoteLines() - 1 - (note.Tone - line.BaseLine) / 2f) * _NoteLineHeight - _AddNoteHeight / 2;
+            float height = _NoteLineHeight + _AddNoteHeight;
+
+            if (isRapNote) {
+                y = Rect.Y;
+                height = Rect.H;
+            }

            var noteRect = new SRectF(
                Rect.X + (note.StartBeat - line.FirstNoteBeat) * Rect.W / beats,
-                Rect.Y + (CBase.Settings.GetNumNoteLines() - 1 - (note.Tone - line.BaseLine) / 2f) * _NoteLineHeight - _AddNoteHeight / 2,
+                y,
                width,
-                _NoteLineHeight + _AddNoteHeight,
+                height,
                Rect.Z
                );
            return noteRect;
@@ -267,26 +275,26 @@ namespace VocaluxeLib.Menu.SingNotes
            CBase.Drawing.DrawTexture(noteEnd, new SRectF(noteRect.X + noteRect.W - endsW, noteRect.Y, endsW, noteRect.H, noteRect.Z), color, false);
        }

-        private void _DrawNoteBase(SRectF rect, SColorF color, float factor)
+        private void _DrawNoteBase(SRectF rect, SColorF color, float factor, bool isRapNote = false)
        {
-            CTextureRef noteBegin = CBase.Themes.GetSkinTexture(_Theme.SkinLeft, _PartyModeID);
-            CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(_Theme.SkinMiddle, _PartyModeID);
-            CTextureRef noteEnd = CBase.Themes.GetSkinTexture(_Theme.SkinRight, _PartyModeID);
+            CTextureRef noteBegin = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapLeft : _Theme.SkinLeft, _PartyModeID);
+            CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapMiddle : _Theme.SkinMiddle, _PartyModeID);
+            CTextureRef noteEnd = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapRight : _Theme.SkinRight, _PartyModeID);

            _DrawNote(rect, color, noteBegin, noteMiddle, noteEnd, factor);
        }

-        private void _DrawNoteFill(SRectF rect, SColorF color, float factor)
+        private void _DrawNoteFill(SRectF rect, SColorF color, float factor, bool isRapNote = false)
        {

-            CTextureRef noteBegin = CBase.Themes.GetSkinTexture(_Theme.SkinFillLeft, _PartyModeID);
-            CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(_Theme.SkinFillMiddle, _PartyModeID);
-            CTextureRef noteEnd = CBase.Themes.GetSkinTexture(_Theme.SkinFillRight, _PartyModeID);
+            CTextureRef noteBegin = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapFillLeft : _Theme.SkinFillLeft, _PartyModeID);
+            CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapFillMiddle : _Theme.SkinFillMiddle, _PartyModeID);
+            CTextureRef noteEnd = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapFillRight : _Theme.SkinFillRight, _PartyModeID);

            _DrawNote(rect, color, noteBegin, noteMiddle, noteEnd, factor);
        }

-        private void _DrawNoteBG(SRectF rect, SColorF color)
+        private void _DrawNoteBG(SRectF rect, SColorF color, bool isRapNote = false)
        {
            const float period = 1500; //[ms]

@@ -300,9 +308,9 @@ namespace VocaluxeLib.Menu.SingNotes

            var col = new SColorF(color, color.A * alpha);

-            CTextureRef noteBegin = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundLeft, _PartyModeID);
-            CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundMiddle, _PartyModeID);
-            CTextureRef noteEnd = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundRight, _PartyModeID);
+            CTextureRef noteBegin = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapBackgroundLeft : _Theme.SkinBackgroundLeft, _PartyModeID);
+            CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapBackgroundMiddle : _Theme.SkinBackgroundMiddle, _PartyModeID);
+            CTextureRef noteEnd = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapBackgroundRight : _Theme.SkinBackgroundRight, _PartyModeID);

            _DrawNote(rect, col, noteBegin, noteMiddle, noteEnd, 1f);
        }
@@ -49,6 +49,18 @@ namespace VocaluxeLib.Menu.SingNotes
        public string SkinBackgroundMiddle;
        public string SkinBackgroundRight;

+        public string SkinRapLeft;
+        public string SkinRapMiddle;
+        public string SkinRapRight;
+
+        public string SkinRapFillLeft;
+        public string SkinRapFillMiddle;
+        public string SkinRapFillRight;
+
+        public string SkinRapBackgroundLeft;
+        public string SkinRapBackgroundMiddle;
+        public string SkinRapBackgroundRight;
+
        public string SkinGoldenStar;
        public string SkinToneHelper;
        public string SkinPerfectNoteStart;
@@ -30,6 +30,7 @@ namespace VocaluxeLib.Menu.SongMenu
        public string CoverBackground;
        public string CoverBigBackground;
        public string DuetIcon;
+        public string RapIcon;
        public string VideoIcon;
        public string MedleyCalcIcon;
        public string MedleyTagIcon;
@@ -68,6 +69,7 @@ namespace VocaluxeLib.Menu.SongMenu
        public SThemeStatic StaticCoverBig;
        public SThemeStatic StaticTextBG;
        public SThemeStatic StaticDuetIcon;
+        public SThemeStatic StaticRapIcon;
        public SThemeStatic StaticVideoIcon;
        public SThemeStatic StaticMedleyCalcIcon;
        public SThemeStatic StaticMedleyTagIcon;
@@ -117,6 +119,7 @@ namespace VocaluxeLib.Menu.SongMenu
        public SThemeStatic StaticCoverBig;
        public SThemeStatic StaticTextBG;
        public SThemeStatic StaticDuetIcon;
+        public SThemeStatic StaticRapIcon;
        public SThemeStatic StaticVideoIcon;
        public SThemeStatic StaticMedleyCalcIcon;
        public SThemeStatic StaticMedleyTagIcon;
@@ -33,6 +33,7 @@ namespace VocaluxeLib.Menu.SongMenu
        private readonly CStatic _CoverBig;
        private readonly CStatic _TextBG;
        private readonly CStatic _DuetIcon;
+        private readonly CStatic _RapIcon;
        private readonly CStatic _VideoIcon;
        private readonly CStatic _MedleyCalcIcon;
        private readonly CStatic _MedleyTagIcon;
@@ -123,10 +124,11 @@ namespace VocaluxeLib.Menu.SongMenu
            _CoverBig = new CStatic(_Theme.SongMenuList.StaticCoverBig, _PartyModeID);
            _TextBG = new CStatic(_Theme.SongMenuList.StaticTextBG, _PartyModeID);
            _DuetIcon = new CStatic(_Theme.SongMenuList.StaticDuetIcon, _PartyModeID);
+            _RapIcon = new CStatic(_Theme.SongMenuList.StaticRapIcon, _PartyModeID);
            _VideoIcon = new CStatic(_Theme.SongMenuList.StaticVideoIcon, _PartyModeID);
            _MedleyCalcIcon = new CStatic(_Theme.SongMenuList.StaticMedleyCalcIcon, _PartyModeID);
            _MedleyTagIcon = new CStatic(_Theme.SongMenuList.StaticMedleyTagIcon, _PartyModeID);
-            _SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _SongYear, _DuetIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon});
+            _SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _SongYear, _DuetIcon, _RapIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon});
        }

        private void _ReadSubTheme()
@@ -137,6 +139,7 @@ namespace VocaluxeLib.Menu.SongMenu
            _Theme.SongMenuList.TextTitle = (SThemeText)_Title.GetTheme();
            _Theme.SongMenuList.StaticCoverBig = (SThemeStatic)_CoverBig.GetTheme();
            _Theme.SongMenuList.StaticDuetIcon = (SThemeStatic)_DuetIcon.GetTheme();
+            _Theme.SongMenuList.StaticRapIcon = (SThemeStatic)_RapIcon.GetTheme();
            _Theme.SongMenuList.StaticMedleyCalcIcon = (SThemeStatic)_MedleyCalcIcon.GetTheme();
            _Theme.SongMenuList.StaticMedleyTagIcon = (SThemeStatic)_MedleyTagIcon.GetTheme();
            _Theme.SongMenuList.StaticTextBG = (SThemeStatic)_TextBG.GetTheme();
@@ -222,6 +225,7 @@ namespace VocaluxeLib.Menu.SongMenu
            _SongLength.Text = String.Empty;
            _SongYear.Text = String.Empty;
            _DuetIcon.Visible = false;
+            _RapIcon.Visible = false;
            _VideoIcon.Visible = false;
            _MedleyCalcIcon.Visible = false;
            _MedleyTagIcon.Visible = false;
@@ -251,6 +255,7 @@ namespace VocaluxeLib.Menu.SongMenu
                _Title.Text = song.Title;
                _SongYear.Text = song.Year;
                _DuetIcon.Visible = song.IsDuet;
+                _RapIcon.Visible = song.IsRap;
                _VideoIcon.Visible = song.VideoFileName != "";
                _MedleyCalcIcon.Visible = song.Medley.Source == EDataSource.Calculated;
                _MedleyTagIcon.Visible = song.Medley.Source == EDataSource.Tag;
@@ -32,6 +32,7 @@ namespace VocaluxeLib.Menu.SongMenu
        private CStatic _CoverBig;
        private CStatic _TextBG;
        private CStatic _DuetIcon;
+        private CStatic _RapIcon;
        private CStatic _VideoIcon;
        private CStatic _MedleyCalcIcon;
        private CStatic _MedleyTagIcon;
@@ -118,10 +119,11 @@ namespace VocaluxeLib.Menu.SongMenu
            _CoverBig = new CStatic(_Theme.SongMenuTileBoard.StaticCoverBig, _PartyModeID);
            _TextBG = new CStatic(_Theme.SongMenuTileBoard.StaticTextBG, _PartyModeID);
            _DuetIcon = new CStatic(_Theme.SongMenuTileBoard.StaticDuetIcon, _PartyModeID);
+            _RapIcon = new CStatic(_Theme.SongMenuTileBoard.StaticRapIcon, _PartyModeID);
            _VideoIcon = new CStatic(_Theme.SongMenuTileBoard.StaticVideoIcon, _PartyModeID);
            _MedleyCalcIcon = new CStatic(_Theme.SongMenuTileBoard.StaticMedleyCalcIcon, _PartyModeID);
            _MedleyTagIcon = new CStatic(_Theme.SongMenuTileBoard.StaticMedleyTagIcon, _PartyModeID);
-            _SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _SongYear, _DuetIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon});
+            _SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _SongYear, _DuetIcon, _RapIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon});
        }

        private void _UpdateTileSelection()
@@ -141,6 +143,7 @@ namespace VocaluxeLib.Menu.SongMenu
            _Theme.SongMenuTileBoard.TextTitle = (SThemeText)_Title.GetTheme();
            _Theme.SongMenuTileBoard.StaticCoverBig = (SThemeStatic)_CoverBig.GetTheme();
            _Theme.SongMenuTileBoard.StaticDuetIcon = (SThemeStatic)_DuetIcon.GetTheme();
+            _Theme.SongMenuTileBoard.StaticRapIcon = (SThemeStatic)_RapIcon.GetTheme();
            _Theme.SongMenuTileBoard.StaticMedleyCalcIcon = (SThemeStatic)_MedleyCalcIcon.GetTheme();
            _Theme.SongMenuTileBoard.StaticMedleyTagIcon = (SThemeStatic)_MedleyTagIcon.GetTheme();
            _Theme.SongMenuTileBoard.StaticTextBG = (SThemeStatic)_TextBG.GetTheme();
@@ -213,6 +216,7 @@ namespace VocaluxeLib.Menu.SongMenu
            _SongLength.Text = String.Empty;
            _SongYear.Text = String.Empty;
            _DuetIcon.Visible = false;
+            _RapIcon.Visible = false;
            _VideoIcon.Visible = false;
            _MedleyCalcIcon.Visible = false;
            _MedleyTagIcon.Visible = false;
@@ -242,6 +246,7 @@ namespace VocaluxeLib.Menu.SongMenu
                _Title.Text = song.Title;
                _SongYear.Text = song.Year;
                _DuetIcon.Visible = song.IsDuet;
+                _RapIcon.Visible = song.IsRap;
                _VideoIcon.Visible = song.VideoFileName != "";
                _MedleyCalcIcon.Visible = song.Medley.Source == EDataSource.Calculated;
                _MedleyTagIcon.Visible = song.Medley.Source == EDataSource.Tag;
@@ -82,6 +82,20 @@ namespace VocaluxeLib.Songs
        }

        public abstract int PointsForBeat { get; }
+
+        public bool IsRapNote
+        {
+            get { return IsNoteType(ENoteType.Rap, ENoteType.RapGolden); }
+        }
+
+        public bool IsGoldenNote
+        {
+            get { return IsNoteType(ENoteType.Golden, ENoteType.RapGolden); }
+        }
        #endregion Properties
+
+        #region Methods
+        public abstract bool IsNoteType(params ENoteType[] noteTypes);
+        #endregion Methods
    }
 }
@@ -165,6 +165,7 @@ namespace VocaluxeLib.Songs
        {
            get { return Notes.VoiceCount > 1; }
        }
+        public bool IsRap = false;

        public readonly List<string> Editions = new List<string>();
        public readonly List<string> Genres = new List<string>();
@@ -570,9 +570,9 @@ namespace VocaluxeLib.Songs
                                break;
                            case ':':
                            case '*':
+                            case 'R':
+                            case 'G':
                            case 'F':
-                            case 'R':   // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
-                            case 'G':   // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
                                string[] noteData = line.Split(splitChars, 4);
                                if (noteData.Length < 4)
                                {
@@ -622,6 +622,16 @@ namespace VocaluxeLib.Songs
                                        noteType = ENoteType.Golden;
                                    else if (tag.Equals('F') || tag.Equals('R') || tag.Equals('G'))  // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
                                        noteType = ENoteType.Freestyle;
+                                    else if (tag.Equals('R'))
+                                    {
+                                        noteType = ENoteType.Rap;
+                                        _Song.IsRap = true;
+                                    }
+                                    else if (tag.Equals('G'))
+                                    {
+                                        noteType = ENoteType.RapGolden;
+                                        _Song.IsRap = true;
+                                    }
                                    else
                                        noteType = ENoteType.Normal;

@@ -15,6 +15,8 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion

+using System.Linq;
+
 namespace VocaluxeLib.Songs
 {
    /// <summary>
@@ -37,6 +39,13 @@ namespace VocaluxeLib.Songs
        }
        #endregion Constructors

+        #region Methods
+        public override bool IsNoteType(params ENoteType[] noteTypes)
+        {
+            return noteTypes.Contains(Type);
+        }
+        #endregion Method
+
        #region Properties
        public ENoteType Type { get; set; }

@@ -49,8 +58,10 @@ namespace VocaluxeLib.Songs
                switch (Type)
                {
                    case ENoteType.Normal:
+                    case ENoteType.Rap:
                        return 1;
                    case ENoteType.Golden:
+                    case ENoteType.RapGolden:
                        return 2;
                    case ENoteType.Freestyle:
                        return 0;
@@ -187,6 +187,12 @@ namespace VocaluxeLib.Songs
                                case ENoteType.Freestyle:
                                    tag = "F";
                                    break;
+                                case ENoteType.Rap:
+                                    tag = "R";
+                                    break;
+                                case ENoteType.RapGolden:
+                                    tag = "G";
+                                    break;
                                default:
                                    throw new NotImplementedException("Note type " + note.Type);
                            }
@@ -15,6 +15,8 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion

+using System.Linq;
+
 namespace VocaluxeLib.Songs
 {
    /// <summary>
@@ -74,6 +76,10 @@ namespace VocaluxeLib.Songs

            Perfect = result;
        }
+        public override bool IsNoteType(params ENoteType[] noteTypes)
+        {
+            return HitNote != null && noteTypes.Contains(HitNote.Type);
+        }
        #endregion Methods

        public override int PointsForBeat
@@ -23,6 +23,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Xml;
 using VocaluxeLib.Log;

@@ -179,14 +180,28 @@ namespace VocaluxeLib.Xml
        }

        private readonly IXmlErrorHandler _ErrorHandler;
+        private readonly bool _UnescapeStringValues;
+
+        /// <summary>
+        ///     Creates a new XmlDeserializer
+        /// </summary>
+        /// <param name="unescapeStringValues">Set to true if string values should be unescaped during reading</param>
+        public CXmlDeserializer(bool unescapeStringValues)
+        {
+            _ErrorHandler = new CXmlDefaultErrorHandler();
+            _UnescapeStringValues = unescapeStringValues;
+        }
+

        /// <summary>
        ///     Creates a new XmlDeserializer
        /// </summary>
        /// <param name="errorHandler">Class to be used for error callbacks, if not given a default handler will be used which throws errors and logs warnings</param>
-        public CXmlDeserializer(IXmlErrorHandler errorHandler = null)
+        /// <param name="unescapeStringValues">Set to true if string values should be unescaped during reading</param>
+        public CXmlDeserializer(IXmlErrorHandler errorHandler = null, bool unescapeStringValues = false)
        {
            _ErrorHandler = errorHandler ?? new CXmlDefaultErrorHandler();
+            _UnescapeStringValues = unescapeStringValues;
        }

        /// <summary>
@@ -216,8 +231,15 @@ namespace VocaluxeLib.Xml
            }
            if (type == typeof(Guid))
                return Guid.Parse(node.InnerText);
-            if (type == typeof(string))
-                return node == null ? null : node.InnerText;
+            if (type == typeof(string)) {
+                if(node == null) {
+                    return null;
+                } else if(_UnescapeStringValues) {
+                    return Regex.Unescape(node.InnerText);
+                } else {
+                    return node.InnerText;
+                }
+            }
            if (type.IsPrimitive)
                return _GetPrimitiveValue(node, type) ?? value;
            if (type.IsNullable())
@@ -0,0 +1,24 @@
+git:
+  filters:
+    - filter_type: file
+      file_format: ANDROID
+      source_file: Output/Languages/en.xml
+      source_language: en
+      translation_files_expression: 'Output/Languages/<lang>.xml'
+    - filter_type: file
+      file_format: ANDROID
+      source_file: Output/PartyModes/Challenge/Languages/en.xml
+      source_language: en
+      translation_files_expression: 'Output/PartyModes/Challenge/Languages/<lang>.xml'
+    - filter_type: file
+      file_format: ANDROID
+      source_file: Output/PartyModes/TicTacToe/Languages/en.xml
+      source_language: en
+      translation_files_expression: 'Output/PartyModes/TicTacToe/Languages/<lang>.xml'
+    - filter_type: file
+      file_format: KEYVALUEJSON
+      source_file: Vocaluxe/Website/locales/en.json
+      source_language: en
+      translation_files_expression: 'Vocaluxe/Website/locales/<lang>.json'
+  settings:
+    pr_branch_name: translations/<br_unique_id>