From 2f7d2f98e8c037fc4bc79beafbcf3636648d7d62 Mon Sep 17 00:00:00 2001
From: Jiiniasu <jiiniasu@gief.info>
Date: Sun, 10 Apr 2016 12:26:47 +0200
Subject: [PATCH 01/44] Make screenshots save as PNG

---
 Vocaluxe/Lib/Draw/CDirect3D.cs    | 6 +++---
 Vocaluxe/Lib/Draw/CDrawWinForm.cs | 2 +-
 Vocaluxe/Lib/Draw/COpenGL.cs      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Vocaluxe/Lib/Draw/CDirect3D.cs b/Vocaluxe/Lib/Draw/CDirect3D.cs
index fc58ebb1..df93e1a8 100644
--- a/Vocaluxe/Lib/Draw/CDirect3D.cs
+++ b/Vocaluxe/Lib/Draw/CDirect3D.cs
@@ -556,13 +556,13 @@ namespace Vocaluxe.Lib.Draw
         /// </summary>
         public void MakeScreenShot()
         {
-            string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.bmp");
+            string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.png");
 
             //create a surface of the frame
             using (Surface surface = _Device.GetBackBuffer(0, 0))
             {
-                var screen = new Bitmap(Surface.ToStream(surface, ImageFileFormat.Bmp));
-                screen.Save(file, ImageFormat.Bmp);
+                var screen = new Bitmap(Surface.ToStream(surface, ImageFileFormat.Png));
+                screen.Save(file, ImageFormat.Png);
                 screen.Dispose();
             }
         }
diff --git a/Vocaluxe/Lib/Draw/CDrawWinForm.cs b/Vocaluxe/Lib/Draw/CDrawWinForm.cs
index 6a1b94a7..b06d0929 100644
--- a/Vocaluxe/Lib/Draw/CDrawWinForm.cs
+++ b/Vocaluxe/Lib/Draw/CDrawWinForm.cs
@@ -303,7 +303,7 @@ namespace Vocaluxe.Lib.Draw
 
         public void MakeScreenShot()
         {
-            string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.bmp");
+            string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.png");
 
             _Backbuffer.Save(file, ImageFormat.Png);
         }
diff --git a/Vocaluxe/Lib/Draw/COpenGL.cs b/Vocaluxe/Lib/Draw/COpenGL.cs
index 46cb7d15..a2d46014 100644
--- a/Vocaluxe/Lib/Draw/COpenGL.cs
+++ b/Vocaluxe/Lib/Draw/COpenGL.cs
@@ -291,7 +291,7 @@ namespace Vocaluxe.Lib.Draw
 
         public void MakeScreenShot()
         {
-            string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.bmp");
+            string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.png");
 
             int width = GetScreenWidth();
             int height = GetScreenHeight();
@@ -304,7 +304,7 @@ namespace Vocaluxe.Lib.Draw
                 screen.UnlockBits(bmpData);
 
                 screen.RotateFlip(RotateFlipType.RotateNoneFlipY);
-                screen.Save(file, ImageFormat.Bmp);
+                screen.Save(file, ImageFormat.Png);
             }
         }
 

From d41376517866d924bdd95029076afb7f0c9813a3 Mon Sep 17 00:00:00 2001
From: Jiiniasu <jiiniasu@gief.info>
Date: Sun, 4 Sep 2016 18:32:24 +0200
Subject: [PATCH 02/44] Add Highscore Style Setting

Add ability to select whether the highscore screen should display all
scores or only the best score for each player, difficulty and
duet-track.
---
 Output/Languages/English.xml                  |  3 +
 .../Ambient/Screens/ScreenOptionsGame.xml     | 58 ++++++++++++++++++-
 .../Changelog/Changelog_ScreenOptionsGame.txt |  6 ++
 Vocaluxe/Base/CConfig.cs                      |  1 +
 Vocaluxe/Base/CMain.cs                        |  5 ++
 Vocaluxe/Lib/Database/CHighscoreDB.cs         |  9 ++-
 Vocaluxe/Screens/CScreenOptionsGame.cs        |  7 ++-
 VocaluxeLib/Enums.cs                          |  6 ++
 VocaluxeLib/IBasic.cs                         |  2 +
 9 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml
index f5fc89bc..c3aefaf8 100644
--- a/Output/Languages/English.xml
+++ b/Output/Languages/English.xml
@@ -73,6 +73,8 @@
   <string name="TR_CONFIG_TIMERMODE_TOTAL">Total</string>
   <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
   <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Expanded</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_ALL">List all</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_BEST">List best</string>
   <string name="TR_CONFIG_OWN_MUSIC">Own music and background-music</string>
   <string name="TR_CONFIG_NO_OWN_MUSIC">No own music</string>
   <string name="TR_CONFIG_ONLY_OWN_MUSIC">Only own music</string>
@@ -183,6 +185,7 @@
   <string name="TR_SCREENOGAME_TABS">Tabs</string>
   <string name="TR_SCREENOGAME_DIFFICULTY">Game difficulty</string>
   <string name="TR_SCREENOGAME_TIMERMODE">Timer mode</string>
+  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Highscore style</string>
   <string name="TR_SCREENORECORD_OPTIONS">Record Options</string>
   <string name="TR_SCREENORECORD_DEVICE">Device</string>
   <string name="TR_SCREENORECORD_INPUT">Input</string>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
index 5b3b6ec4..c546c94a 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
@@ -2,7 +2,7 @@
 <Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Informations>
     <ScreenName>ScreenOptionsGame</ScreenName>
-    <ScreenVersion>2</ScreenVersion>
+    <ScreenVersion>3</ScreenVersion>
   </Informations>
   <Backgrounds>
     <Background Name="Background1">
@@ -191,6 +191,20 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOGAME_TIMERMODE</Text>
     </Text>
+    <Text Name="Text8">
+      <X>75</X>
+      <Y>467</Y>
+      <Z>0</Z>
+      <H>27</H>
+      <MaxW>0</MaxW>
+      <Color Name="StaticColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENOGAME_HIGHSCORESTYLE</Text>
+    </Text>
   </Texts>
   <Buttons>
     <Button Name="ButtonExit">
@@ -519,6 +533,48 @@
       <TextStyle>Bold</TextStyle>
       <NumVisible>3</NumVisible>
     </SelectSlide>
+    <SelectSlide Name="SelectSlideHighscoreStyle">
+      <Skin/>
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>500</X>
+        <Y>460</Y>
+        <W>700</W>
+        <H>50</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>505</X>
+        <Y>465</Y>
+        <W>40</W>
+        <H>40</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1170</X>
+        <Y>465</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="TextColor" />
+      <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>
   <SingNotes />
   <NameSelections />
diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsGame.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsGame.txt
index e60b7e4a..fcc4de50 100644
--- a/Output/Themes/Changelog/Changelog_ScreenOptionsGame.txt
+++ b/Output/Themes/Changelog/Changelog_ScreenOptionsGame.txt
@@ -1,5 +1,11 @@
 ScreenOptionsGame
 
+++++++++++
+Version 3:
+
+Add:
+<Text8>
+<SelectSlideHighscoreStyle>
 ++++++++++
 Version 2:
 
diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs
index 85d7d409..fccfed10 100644
--- a/Vocaluxe/Base/CConfig.cs
+++ b/Vocaluxe/Base/CConfig.cs
@@ -139,6 +139,7 @@ namespace Vocaluxe.Base
             [DefaultValue(ELyricsPosition.TR_CONFIG_LYRICSPOSITION_BOTTOM)] public ELyricsPosition LyricsPosition;
             [DefaultValue(0.1f)] public float MinLineBreakTime; //Minimum time to show the text before it is (to be) sung (if possible)
             [XmlArrayItem("Player"), XmlArray] public string[] Players;
+            [DefaultValue(EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_BEST)] public EHighscoreStyle HighscoreStyle;
         }
 
         public struct SConfigVideo
diff --git a/Vocaluxe/Base/CMain.cs b/Vocaluxe/Base/CMain.cs
index b5d2e0c7..3a131649 100644
--- a/Vocaluxe/Base/CMain.cs
+++ b/Vocaluxe/Base/CMain.cs
@@ -91,6 +91,11 @@ namespace Vocaluxe.Base
             return CConfig.SongMenu;
         }
 
+        public EHighscoreStyle GetHighscoreStyle()
+        {
+            return CConfig.Config.Game.HighscoreStyle;
+        }
+
         public EOffOn GetVideosToBackground()
         {
             return CConfig.Config.Video.VideosToBackground;
diff --git a/Vocaluxe/Lib/Database/CHighscoreDB.cs b/Vocaluxe/Lib/Database/CHighscoreDB.cs
index 6733e217..cc122fec 100644
--- a/Vocaluxe/Lib/Database/CHighscoreDB.cs
+++ b/Vocaluxe/Lib/Database/CHighscoreDB.cs
@@ -305,8 +305,13 @@ namespace Vocaluxe.Lib.Database
                         return scores;
 
                     command.CommandText = "SELECT PlayerName, Score, Date, Difficulty, LineNr, id FROM Scores " +
-                                          "WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
-                                          "ORDER BY [Score] DESC";
+                                          "WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong ";
+                    if (CBase.Config.GetHighscoreStyle() == EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_BEST)
+                    {
+                        command.CommandText += "GROUP BY PlayerName, Difficulty, LineNr ";
+                    }
+                    command.CommandText += "ORDER BY [Score] DESC, [Date] ASC";
+
                     command.Parameters.Add("@SongID", DbType.Int32, 0).Value = dataBaseSongID;
                     command.Parameters.Add("@Medley", DbType.Int32, 0).Value = medley;
                     command.Parameters.Add("@Duet", DbType.Int32, 0).Value = duet;
diff --git a/Vocaluxe/Screens/CScreenOptionsGame.cs b/Vocaluxe/Screens/CScreenOptionsGame.cs
index 71ff7197..485ce2b0 100644
--- a/Vocaluxe/Screens/CScreenOptionsGame.cs
+++ b/Vocaluxe/Screens/CScreenOptionsGame.cs
@@ -27,7 +27,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 2; }
+            get { return 3; }
         }
 
         private const string _SelectSlideLanguage = "SelectSlideLanguage";
@@ -36,6 +36,7 @@ namespace Vocaluxe.Screens
         private const string _SelectSlideSongSorting = "SelectSlideSongSorting";
         private const string _SelectSlideTabs = "SelectSlideTabs";
         private const string _SelectSlideTimerMode = "SelectSlideTimerMode";
+        private const string _SelectSlideHighscoreStyle = "SelectSlideHighscoreStyle";
 
         private const string _ButtonExit = "ButtonExit";
         private const string _ButtonServer = "ButtonServer";
@@ -45,7 +46,7 @@ namespace Vocaluxe.Screens
             base.Init();
 
             _ThemeButtons = new string[] {_ButtonExit, _ButtonServer};
-            _ThemeSelectSlides = new string[] {_SelectSlideLanguage, _SelectSlideDebugLevel, _SelectSlideSongMenu, _SelectSlideSongSorting, _SelectSlideTabs, _SelectSlideTimerMode};
+            _ThemeSelectSlides = new string[] {_SelectSlideLanguage, _SelectSlideDebugLevel, _SelectSlideSongMenu, _SelectSlideSongSorting, _SelectSlideTabs, _SelectSlideTimerMode, _SelectSlideHighscoreStyle};
         }
 
         public override void LoadTheme(string xmlPath)
@@ -60,6 +61,7 @@ namespace Vocaluxe.Screens
             _SelectSlides[_SelectSlideSongSorting].SetValues<ESongSorting>((int)CConfig.Config.Game.SongSorting);
             _SelectSlides[_SelectSlideTabs].SetValues<EOffOn>((int)CConfig.Config.Game.Tabs);
             _SelectSlides[_SelectSlideTimerMode].SetValues<ETimerMode>((int)CConfig.Config.Game.TimerMode);
+            _SelectSlides[_SelectSlideHighscoreStyle].SetValues<EHighscoreStyle>((int)CConfig.Config.Game.HighscoreStyle);
         }
 
         public override bool HandleInput(SKeyEvent keyEvent)
@@ -140,6 +142,7 @@ namespace Vocaluxe.Screens
             CConfig.Config.Game.SongSorting = (ESongSorting)_SelectSlides[_SelectSlideSongSorting].Selection;
             CConfig.Config.Game.Tabs = (EOffOn)_SelectSlides[_SelectSlideTabs].Selection;
             CConfig.Config.Game.TimerMode = (ETimerMode)_SelectSlides[_SelectSlideTimerMode].Selection;
+            CConfig.Config.Game.HighscoreStyle = (EHighscoreStyle)_SelectSlides[_SelectSlideHighscoreStyle].Selection;
 
             CConfig.SaveConfig();
 
diff --git a/VocaluxeLib/Enums.cs b/VocaluxeLib/Enums.cs
index fb4f08a2..39e8399f 100644
--- a/VocaluxeLib/Enums.cs
+++ b/VocaluxeLib/Enums.cs
@@ -369,6 +369,12 @@ namespace VocaluxeLib
         Game
     }
 
+    public enum EHighscoreStyle
+    {
+        TR_CONFIG_HIGHSCORE_LIST_ALL,
+        TR_CONFIG_HIGHSCORE_LIST_BEST
+    }
+
     /// <summary>
     ///     Base screens
     /// </summary>
diff --git a/VocaluxeLib/IBasic.cs b/VocaluxeLib/IBasic.cs
index 1374ae86..0e35883e 100644
--- a/VocaluxeLib/IBasic.cs
+++ b/VocaluxeLib/IBasic.cs
@@ -46,6 +46,8 @@ namespace VocaluxeLib
 
         ESongMenu GetSongMenuType();
 
+        EHighscoreStyle GetHighscoreStyle();
+
         EOffOn GetDrawNoteLines();
         EOffOn GetDrawToneHelper();
 

From 70d190c5719f9697ac3a2615a691095c8d8169d6 Mon Sep 17 00:00:00 2001
From: Jiiniasu <jiiniasu@gief.info>
Date: Sun, 4 Sep 2016 18:34:26 +0200
Subject: [PATCH 03/44] Remove Leading Zeroes in Highscore screen

---
 Vocaluxe/Screens/CScreenHighscore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vocaluxe/Screens/CScreenHighscore.cs b/Vocaluxe/Screens/CScreenHighscore.cs
index 9ed25e9b..36f91a5a 100644
--- a/Vocaluxe/Screens/CScreenHighscore.cs
+++ b/Vocaluxe/Screens/CScreenHighscore.cs
@@ -177,7 +177,7 @@ namespace Vocaluxe.Screens
                         name += " (P" + (_Scores[_Round][_Pos + p].VoiceNr + 1) + ")";
                     _Texts[_TextName[p]].Text = name;
 
-                    _Texts[_TextScore[p]].Text = _Scores[_Round][_Pos + p].Score.ToString("00000");
+                    _Texts[_TextScore[p]].Text = _Scores[_Round][_Pos + p].Score.ToString("D");
                     _Texts[_TextDate[p]].Text = _Scores[_Round][_Pos + p].Date;
 
                     _ParticleEffects[_ParticleEffectNew[p]].Visible = _IsNewEntry(_Scores[_Round][_Pos + p].ID);

From 9211e68ad40536cac075bbe3b80b1f882fe93b0e Mon Sep 17 00:00:00 2001
From: Jiiniasu <jiiniasu@gief.info>
Date: Sun, 4 Sep 2016 18:41:49 +0200
Subject: [PATCH 04/44] Add Swedish Translation for Highscore Style

---
 Output/Languages/Swedish.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Output/Languages/Swedish.xml b/Output/Languages/Swedish.xml
index d078b7d1..721e4023 100644
--- a/Output/Languages/Swedish.xml
+++ b/Output/Languages/Swedish.xml
@@ -73,6 +73,8 @@
   <string name="TR_CONFIG_TIMERMODE_TOTAL">Total</string>
   <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
   <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Utvidgad</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_ALL">Lista alla</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_BEST">Lista bästa</string>
   <string name="TR_CONFIG_OWN_MUSIC">Egen musik och bakgrundsmusik</string>
   <string name="TR_CONFIG_NO_OWN_MUSIC">Ingen egen musik</string>
   <string name="TR_CONFIG_ONLY_OWN_MUSIC">Endast egen musik</string>
@@ -183,6 +185,7 @@
   <string name="TR_SCREENOGAME_TABS">Flikar</string>
   <string name="TR_SCREENOGAME_DIFFICULTY">Spelets svårighetsgrad</string>
   <string name="TR_SCREENOGAME_TIMERMODE">Timerläge</string>
+  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Topplistestil</string>
   <string name="TR_SCREENORECORD_OPTIONS">Inspelningsalternativ</string>
   <string name="TR_SCREENORECORD_DEVICE">Enhet</string>
   <string name="TR_SCREENORECORD_INPUT">Ingång</string>

From 27d4d21167ec6e3a273fa979db427272f403588a Mon Sep 17 00:00:00 2001
From: Jiiniasu <jiiniasu@gief.info>
Date: Sun, 4 Sep 2016 19:07:41 +0200
Subject: [PATCH 05/44] Correct Deviating Height of #2 in Highscore

---
 Output/Themes/Ambient/Screens/ScreenHighscore.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Output/Themes/Ambient/Screens/ScreenHighscore.xml b/Output/Themes/Ambient/Screens/ScreenHighscore.xml
index 4e997947..a97ba707 100644
--- a/Output/Themes/Ambient/Screens/ScreenHighscore.xml
+++ b/Output/Themes/Ambient/Screens/ScreenHighscore.xml
@@ -98,7 +98,7 @@
       <X>120</X>
       <Y>160</Y>
       <Z>0</Z>
-      <H>42</H>
+      <H>35</H>
       <MaxW>0</MaxW>
       <Color Name="StaticColor" />
       <SelColor Name="TextSelColor" />
@@ -792,4 +792,4 @@
     </ParticleEffect>
   </ParticleEffects>
   <ScreenSettings />
-</Screen>
\ No newline at end of file
+</Screen>

From 8bde612db4b00f74c3e1c1bf84d0a713c024b8a1 Mon Sep 17 00:00:00 2001
From: Jiiniasu <jiiniasu@gief.info>
Date: Mon, 5 Sep 2016 21:24:50 +0200
Subject: [PATCH 06/44] Adjust SQL Query + Making Style a Parameter

Applied query based on lukeIam's suggestion which gives expected data
from the database and added style as a parameter based on flokueps
suggestion.
---
 Vocaluxe/Base/CDataBase.cs            |  4 ++--
 Vocaluxe/Lib/Database/CHighscoreDB.cs | 27 +++++++++++++++++++++------
 Vocaluxe/Screens/CScreenHighscore.cs  |  3 ++-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Vocaluxe/Base/CDataBase.cs b/Vocaluxe/Base/CDataBase.cs
index fad913e8..8887982f 100644
--- a/Vocaluxe/Base/CDataBase.cs
+++ b/Vocaluxe/Base/CDataBase.cs
@@ -85,9 +85,9 @@ namespace Vocaluxe.Base
             return _HighscoreDB.GetDataBaseSongInfos(artist, title, out numPlayed, out dateAdded, out highscoreID);
         }
 
-        public static List<SDBScoreEntry> LoadScore(int songID, EGameMode gameMode)
+        public static List<SDBScoreEntry> LoadScore(int songID, EGameMode gameMode, EHighscoreStyle style)
         {
-            return _HighscoreDB == null ? null : _HighscoreDB.LoadScore(songID, gameMode);
+            return _HighscoreDB == null ? null : _HighscoreDB.LoadScore(songID, gameMode, style);
         }
 
         public static int AddScore(SPlayer player)
diff --git a/Vocaluxe/Lib/Database/CHighscoreDB.cs b/Vocaluxe/Lib/Database/CHighscoreDB.cs
index cc122fec..c4bf966f 100644
--- a/Vocaluxe/Lib/Database/CHighscoreDB.cs
+++ b/Vocaluxe/Lib/Database/CHighscoreDB.cs
@@ -266,7 +266,7 @@ namespace Vocaluxe.Lib.Database
             return lastInsertID;
         }
 
-        public List<SDBScoreEntry> LoadScore(int songID, EGameMode gameMode)
+        public List<SDBScoreEntry> LoadScore(int songID, EGameMode gameMode, EHighscoreStyle style)
         {
             var scores = new List<SDBScoreEntry>();
             using (var connection = new SQLiteConnection())
@@ -304,13 +304,28 @@ namespace Vocaluxe.Lib.Database
                     if (dataBaseSongID < 0)
                         return scores;
 
-                    command.CommandText = "SELECT PlayerName, Score, Date, Difficulty, LineNr, id FROM Scores " +
-                                          "WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong ";
-                    if (CBase.Config.GetHighscoreStyle() == EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_BEST)
+                    switch (style)
                     {
-                        command.CommandText += "GROUP BY PlayerName, Difficulty, LineNr ";
+                        case EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_BEST:
+                            command.CommandText = "SELECT sc.PlayerName, sc.Score, MIN(sc.Date) AS Date, sc.Difficulty, sc.LineNr, sc.id " +
+                            "FROM Scores sc " +
+                            "INNER JOIN ( " +
+                            "SELECT Playername, MAX(Score) AS _Score, Difficulty, LineNr, id " +
+                            "FROM Scores " +
+                            "WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
+                            "GROUP BY PlayerName, Difficulty, LineNr "+
+                            ") AS mc " +
+                            "ON sc.PlayerName = mc.PlayerName AND sc.Difficulty = mc.Difficulty AND sc.LineNr = mc.LineNr AND sc.Score = mc._Score AND sc.id = mc.id " +
+                            "GROUP BY sc.PlayerName, sc.Difficulty, sc.LineNr, sc.Score " +
+                            "ORDER BY [Score] DESC, [Date] ASC";
+                            break;
+                        case EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_ALL:
+                            command.CommandText = "SELECT PlayerName, Score, Date, Difficulty, LineNr, id " +
+                            "FROM Scores " +
+                            "WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
+                            "ORDER BY [Score] DESC, [Date] ASC";
+                            break;
                     }
-                    command.CommandText += "ORDER BY [Score] DESC, [Date] ASC";
 
                     command.Parameters.Add("@SongID", DbType.Int32, 0).Value = dataBaseSongID;
                     command.Parameters.Add("@Medley", DbType.Int32, 0).Value = medley;
diff --git a/Vocaluxe/Screens/CScreenHighscore.cs b/Vocaluxe/Screens/CScreenHighscore.cs
index 36f91a5a..182e68ed 100644
--- a/Vocaluxe/Screens/CScreenHighscore.cs
+++ b/Vocaluxe/Screens/CScreenHighscore.cs
@@ -239,7 +239,8 @@ namespace Vocaluxe.Screens
             {
                 int songID = CGame.GetSong(round).ID;
                 EGameMode gameMode = CGame.GetGameMode(round);
-                _Scores[round] = CDataBase.LoadScore(songID, gameMode);
+                EHighscoreStyle style = CBase.Config.GetHighscoreStyle();
+                _Scores[round] = CDataBase.LoadScore(songID, gameMode, style);
             }
         }
 

From b6694eb48519a6949f8894c6de8cb4b7935e457f Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Wed, 7 Sep 2016 16:18:20 +0200
Subject: [PATCH 07/44] Mod: prefer shipped gstreamer over an installed version
 (closes #199)

---
 .../GstreamerSharp/CGstreamerSharpAudio.cs    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
index 73c624f8..28f47f49 100644
--- a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
+++ b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
@@ -35,26 +35,29 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
 #if ARCH_X64
             const string varName = "GSTREAMER_1_0_ROOT_X86_64";
 #endif
-            string gstreamerEnvVar = Environment.GetEnvironmentVariable(varName, EnvironmentVariableTarget.User);
             string dllDirectory;
-            if (gstreamerEnvVar == null || !Directory.Exists(gstreamerEnvVar))
-            {
+
 #if ARCH_X86
-                dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer86\\bin\\");
+            dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer86\\bin\\");
 #endif
 #if ARCH_X64
-                dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer64\\bin\\");
+            dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer64\\bin\\");
 #endif
-                if (!Directory.Exists(dllDirectory))
+            if (!Directory.Exists(dllDirectory))
+            {
+                string gstreamerEnvVar = Environment.GetEnvironmentVariable(varName, EnvironmentVariableTarget.User);
+
+                if (gstreamerEnvVar == null || !Directory.Exists(gstreamerEnvVar))
                 {
                     CLog.LogError("Gstreamer not found! Make sure you installed it correctly and if it set the environment variable '" + varName + "'!", true);
                     return false;
                 }
+                else
+                {
+                    dllDirectory = gstreamerEnvVar + "bin\\";
+                }
             }
-            else
-            {
-                dllDirectory = gstreamerEnvVar + "bin\\";
-            }
+           
             
             COSFunctions.AddEnvironmentPath(dllDirectory);
             #endif

From aa539958590f14fa238baf82bf52136ec638d3f2 Mon Sep 17 00:00:00 2001
From: Jiiniasu <jiiniasu@gief.info>
Date: Wed, 7 Sep 2016 18:22:54 +0200
Subject: [PATCH 08/44] Adjusted SQL Query

Now the query shouldn't be relying on how the particular database engine
works to get the correct results.
---
 Vocaluxe/Lib/Database/CHighscoreDB.cs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/Vocaluxe/Lib/Database/CHighscoreDB.cs b/Vocaluxe/Lib/Database/CHighscoreDB.cs
index c4bf966f..91381729 100644
--- a/Vocaluxe/Lib/Database/CHighscoreDB.cs
+++ b/Vocaluxe/Lib/Database/CHighscoreDB.cs
@@ -307,17 +307,25 @@ namespace Vocaluxe.Lib.Database
                     switch (style)
                     {
                         case EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_BEST:
-                            command.CommandText = "SELECT sc.PlayerName, sc.Score, MIN(sc.Date) AS Date, sc.Difficulty, sc.LineNr, sc.id " +
+                            command.CommandText = "SELECT os.PlayerName, os.Score, os.Date, os.Difficulty, os.LineNr, os.id " +
+                            "FROM Scores os " +
+                            "INNER JOIN ( " +
+                            "SELECT sc.PlayerName, sc.Score, sc.Difficulty, sc.LineNr, MIN(sc.Date) AS Date " +
                             "FROM Scores sc " +
                             "INNER JOIN ( " +
-                            "SELECT Playername, MAX(Score) AS _Score, Difficulty, LineNr, id " +
+                            "SELECT Playername, MAX(Score) AS Score, Difficulty, LineNr " +
                             "FROM Scores " +
                             "WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
-                            "GROUP BY PlayerName, Difficulty, LineNr "+
+                            "GROUP BY PlayerName, Difficulty, LineNr " +
                             ") AS mc " +
-                            "ON sc.PlayerName = mc.PlayerName AND sc.Difficulty = mc.Difficulty AND sc.LineNr = mc.LineNr AND sc.Score = mc._Score AND sc.id = mc.id " +
+                            "ON sc.PlayerName = mc.PlayerName AND sc.Difficulty = mc.Difficulty AND sc.LineNr = mc.LineNr AND sc.Score = mc.Score " +
+                            "WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
                             "GROUP BY sc.PlayerName, sc.Difficulty, sc.LineNr, sc.Score " +
-                            "ORDER BY [Score] DESC, [Date] ASC";
+                            ") AS iq " +
+                            "ON os.PlayerName = iq.PlayerName AND os.Difficulty = iq.Difficulty AND os.LineNr = iq.LineNr AND os.Score = iq.Score AND os.Date = iq.Date " +
+                            "WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
+                            "GROUP BY os.PlayerName, os.Difficulty, os.LineNr, os.Score " +
+                            "ORDER BY os.Score DESC, os.Date ASC";
                             break;
                         case EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_ALL:
                             command.CommandText = "SELECT PlayerName, Score, Date, Difficulty, LineNr, id " +

From 29352278fa70113d6fe5b9960e13dbe1ba89a80d Mon Sep 17 00:00:00 2001
From: Jiiniasu <jiiniasu@gief.info>
Date: Wed, 7 Sep 2016 18:41:44 +0200
Subject: [PATCH 09/44] Fix Typo in Query

BIGING -> BIGINT
---
 Vocaluxe/Lib/Database/CHighscoreDB.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vocaluxe/Lib/Database/CHighscoreDB.cs b/Vocaluxe/Lib/Database/CHighscoreDB.cs
index 91381729..35e9fe87 100644
--- a/Vocaluxe/Lib/Database/CHighscoreDB.cs
+++ b/Vocaluxe/Lib/Database/CHighscoreDB.cs
@@ -503,7 +503,7 @@ namespace Vocaluxe.Lib.Database
                     command.ExecuteNonQuery();
 
                     command.CommandText = "CREATE TABLE IF NOT EXISTS Songs ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
-                                          "Artist TEXT NOT NULL, Title TEXT NOT NULL, NumPlayed INTEGER, DateAdded BIGING);";
+                                          "Artist TEXT NOT NULL, Title TEXT NOT NULL, NumPlayed INTEGER, DateAdded BIGINT);";
                     command.ExecuteNonQuery();
 
                     command.CommandText = "CREATE TABLE IF NOT EXISTS Scores ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +

From 49b971d126271d1c3994601e85820d6df1206995 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Thu, 8 Sep 2016 17:22:33 +0200
Subject: [PATCH 10/44] Add: option to enable KaraokeEffect with gestreamer
 backend (atm only for all audio globally)

---
 .../Ambient/Screens/ScreenOptionsSound.xml    | 56 +++++++++++++++++++
 Vocaluxe/Base/CConfig.cs                      |  6 ++
 .../CGstreamerSharpAudioStream.cs             | 43 +++++++++++++-
 Vocaluxe/Screens/CScreenOptionsSound.cs       | 12 +++-
 4 files changed, 113 insertions(+), 4 deletions(-)

diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
index 9b7e88c6..a42fd2b5 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
@@ -110,6 +110,20 @@
       <Style>Bold</Style>
       <Font>Outline</Font>
       <Text>TR_SCREENOSOUND_GAMEMUSICVOLUME</Text>
+    </Text>
+	<Text Name="Text7">
+      <X>75</X>
+      <Y>407</Y>
+      <Z>0</Z>
+      <H>27</H>
+      <MaxW>0</MaxW>
+      <Color Name="StaticColor" />
+      <SelColor Name="TextSelColor" />
+      <Align>Left</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Outline</Font>
+      <Text>TR_SCREENOSOUND_KARAOKEEFFECT</Text>
     </Text>
   </Texts>
   <Buttons>
@@ -361,6 +375,48 @@
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>3</NumVisible>
+    </SelectSlide>
+	<SelectSlide Name="SelectSlideKaraokeEffect">
+      <Skin/>
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <SkinSelected>SelectSlide</SkinSelected>
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <Rect>
+        <X>500</X>
+        <Y>400</Y>
+        <W>700</W>
+        <H>50</H>
+        <Z>0</Z>
+      </Rect>
+      <RectArrowLeft>
+        <X>505</X>
+        <Y>405</Y>
+        <W>40</W>
+        <H>40</H>
+        <Z>0</Z>
+      </RectArrowLeft>
+      <RectArrowRight>
+        <X>1170</X>
+        <Y>405</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="TextColor" />
+      <TextSelColor Name="TextSelColor" />
+      <TextH>27</TextH>
+      <TextRelativeX>50</TextRelativeX>
+      <TextRelativeY>0</TextRelativeY>
+      <TextMaxW>500</TextMaxW>
+      <TextFont>Outline</TextFont>
+      <TextStyle>Bold</TextStyle>
+      <NumVisible>2</NumVisible>
     </SelectSlide>
   </SelectSlides>
   <SingNotes />
diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs
index 85d7d409..f0460820 100644
--- a/Vocaluxe/Base/CConfig.cs
+++ b/Vocaluxe/Base/CConfig.cs
@@ -120,6 +120,8 @@ namespace Vocaluxe.Base
             [DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn BackgroundMusicUseStart;
             [XmlRanged(0, 100), DefaultValue(50)] public int PreviewMusicVolume;
             [XmlRanged(0, 100), DefaultValue(80)] public int GameMusicVolume;
+            [DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn KaraokeEffect;
+            [XmlRanged(0, 1), DefaultValue(1.0f)] public float KaraokeEffectLevel;
             // ReSharper restore MemberHidesStaticFromOuterClass
         }
 
@@ -452,6 +454,10 @@ namespace Vocaluxe.Base
                     return "Preview Volume from 0 to 100";
                 case "GameMusicVolume":
                     return "Game Volume from 0 to 100";
+                case "KaraokeEffect":
+                    return "Apply a karaoke effect to song playback (EPlaybackLib.GstreamerSharp only)";
+                case "KaraokeEffectLevel":
+                    return "The level of the karaoke effect [0-1] (EPlaybackLib.GstreamerSharp only)";
                 case "Language":
                     return "Game-Language";
                 case "SongFolder":
diff --git a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs
index 5f4e1f40..97a432b0 100644
--- a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs
+++ b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs
@@ -19,6 +19,7 @@ using System;
 using GLib;
 using Gst;
 using Vocaluxe.Base;
+using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
 {
@@ -123,9 +124,29 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
             }
 
             var audioSinkBin = new Bin("Audiosink");
-            audioSinkBin.Add(convert);
-            audioSinkBin.Add(audiosink);
-            convert.Link(audiosink);
+            Element audiokaraoke = null;
+            if (CConfig.Config.Sound.KaraokeEffect == EOffOn.TR_CONFIG_ON)
+            {
+                audiokaraoke = ElementFactory.Make("audiokaraoke", "karaoke");
+                audioSinkBin.Add(audiokaraoke);
+                audioSinkBin.Add(convert); 
+                audioSinkBin.Add(audiosink); 
+                
+                audiokaraoke.Link(audiosink);
+                audiokaraoke["level"] = CConfig.Config.Sound.KaraokeEffectLevel;
+                audiokaraoke["mono-level"] = CConfig.Config.Sound.KaraokeEffectLevel;
+               
+                convert.Link(audiokaraoke);
+            }
+            else
+            {
+                audioSinkBin.Add(convert);
+                audioSinkBin.Add(audiosink);
+                convert.Link(audiosink);
+            }
+
+            
+            
             Pad pad = convert.GetStaticPad("sink");
             GhostPad ghostpad = new GhostPad("sink", pad);
 
@@ -135,6 +156,10 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
                 convert.Dispose();
                 audiosink.Dispose();
                 audioSinkBin.Dispose();
+                if (audiokaraoke != null)
+                {
+                    audiokaraoke.Dispose();
+                }
                 return false;
             }
 
@@ -145,6 +170,10 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
                 audiosink.Dispose();
                 audioSinkBin.Dispose();
                 ghostpad.Dispose();
+                if (audiokaraoke != null)
+                {
+                    audiokaraoke.Dispose();
+                }
                 return false;
             }
             if (!audioSinkBin.AddPad(ghostpad))
@@ -154,6 +183,10 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
                 audiosink.Dispose();
                 audioSinkBin.Dispose();
                 ghostpad.Dispose();
+                if (audiokaraoke != null)
+                {
+                    audiokaraoke.Dispose();
+                }
                 return false;
             }
 
@@ -165,6 +198,10 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
                 audiosink.Dispose();
                 audioSinkBin.Dispose();
                 ghostpad.Dispose();
+                if (audiokaraoke != null)
+                {
+                    audiokaraoke.Dispose();
+                }
                 return false;
             }
             _Element["audio-sink"] = audioSinkBin;
diff --git a/Vocaluxe/Screens/CScreenOptionsSound.cs b/Vocaluxe/Screens/CScreenOptionsSound.cs
index b3deb818..6d3c1fde 100644
--- a/Vocaluxe/Screens/CScreenOptionsSound.cs
+++ b/Vocaluxe/Screens/CScreenOptionsSound.cs
@@ -35,6 +35,7 @@ namespace Vocaluxe.Screens
         private const string _SelectSlideBackgroundMusicSource = "SelectSlideBackgroundMusicSource";
         private const string _SelectSlidePreviewMusicVolume = "SelectSlidePreviewMusicVolume";
         private const string _SelectSlideGameMusicVolume = "SelectSlideGameMusicVolume";
+        private const string _SelectSlideKaraokeEffect = "SelectSlideKaraokeEffect";
 
         private const string _ButtonExit = "ButtonExit";
 
@@ -46,7 +47,7 @@ namespace Vocaluxe.Screens
 
             _ThemeButtons = new string[] {_ButtonExit};
             _ThemeSelectSlides = new string[]
-                {_SelectSlideBackgroundMusic, _SelectSlideBackgroundMusicVolume, _SelectSlideBackgroundMusicSource, _SelectSlidePreviewMusicVolume, _SelectSlideGameMusicVolume};
+                {_SelectSlideBackgroundMusic, _SelectSlideBackgroundMusicVolume, _SelectSlideBackgroundMusicSource, _SelectSlidePreviewMusicVolume, _SelectSlideGameMusicVolume, _SelectSlideKaraokeEffect};
         }
 
         public override void LoadTheme(string xmlPath)
@@ -64,6 +65,11 @@ namespace Vocaluxe.Screens
             _SelectSlides[_SelectSlideGameMusicVolume].AddValues(new string[]
                 {"0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"});
             _SelectSlides[_SelectSlideGameMusicVolume].Selection = CConfig.GameMusicVolume / 5;
+            if (CConfig.Config.Sound.PlayBackLib == EPlaybackLib.GstreamerSharp)
+            {
+                _SelectSlides[_SelectSlideKaraokeEffect].SetValues<EOffOn>((int)CConfig.Config.Sound.KaraokeEffect);
+                _SelectSlides[_SelectSlideBackgroundMusicSource].Selection = (int)CConfig.Config.Sound.KaraokeEffect;
+            }
         }
 
         public override bool HandleInput(SKeyEvent keyEvent)
@@ -147,6 +153,10 @@ namespace Vocaluxe.Screens
             CConfig.Config.Sound.BackgroundMusic = (EBackgroundMusicOffOn)_SelectSlides[_SelectSlideBackgroundMusic].Selection;
             CConfig.Config.Sound.BackgroundMusicSource = (EBackgroundMusicSource)_SelectSlides[_SelectSlideBackgroundMusicSource].Selection;
             CConfig.BackgroundMusicVolume = _SelectSlides[_SelectSlideBackgroundMusicVolume].Selection * 5;
+            if (CConfig.Config.Sound.PlayBackLib == EPlaybackLib.GstreamerSharp)
+            {
+                CConfig.Config.Sound.KaraokeEffect = (EOffOn)_SelectSlides[_SelectSlideKaraokeEffect].Selection;
+            }
             CConfig.SaveConfig();
 
             CBackgroundMusic.SetMusicSource(CConfig.Config.Sound.BackgroundMusicSource);

From 3275aa091eba7aff9d7f4c972fcca91653c26ec6 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Thu, 8 Sep 2016 17:54:39 +0200
Subject: [PATCH 11/44] Fix: karaoke effect was applied to all audio output

---
 Vocaluxe/Base/CSound.cs                                     | 5 +++--
 Vocaluxe/Lib/Sound/Playback/CAudioStreamBase.cs             | 4 +++-
 Vocaluxe/Lib/Sound/Playback/CPlaybackBase.cs                | 6 +++---
 .../Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs   | 4 ++--
 .../Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs   | 4 ++--
 Vocaluxe/Lib/Sound/Playback/IPlayback.cs                    | 2 +-
 Vocaluxe/Lib/Sound/Playback/OpenAL/COpenALPlay.cs           | 4 ++--
 Vocaluxe/Lib/Sound/Playback/OpenAL/COpenAlStream.cs         | 2 +-
 Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioPlay.cs     | 4 ++--
 Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioStream.cs   | 2 +-
 Vocaluxe/Screens/CScreenSing.cs                             | 3 ++-
 Vocaluxe/Vocaluxe.csproj                                    | 1 +
 12 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Vocaluxe/Base/CSound.cs b/Vocaluxe/Base/CSound.cs
index dc76f86f..5acbd7c9 100644
--- a/Vocaluxe/Base/CSound.cs
+++ b/Vocaluxe/Base/CSound.cs
@@ -22,6 +22,7 @@ using Vocaluxe.Lib.Sound.Playback.OpenAL;
 using Vocaluxe.Lib.Sound.Playback.PortAudio;
 using VocaluxeLib;
 using System.Threading;
+using Vocaluxe.Lib.Sound;
 
 namespace Vocaluxe.Base
 {
@@ -88,9 +89,9 @@ namespace Vocaluxe.Base
         }
 
         #region Stream Handling
-        public static int Load(string media, bool loop = false, bool prescan = false)
+        public static int Load(string media, bool loop = false, bool prescan = false, EAudioEffect effekt = EAudioEffect.None)
         {
-            return _Playback.Load(media, loop, prescan);
+            return _Playback.Load(media, loop, prescan, effekt);
         }
 
         public static void Close(int stream)
diff --git a/Vocaluxe/Lib/Sound/Playback/CAudioStreamBase.cs b/Vocaluxe/Lib/Sound/Playback/CAudioStreamBase.cs
index 3a421cce..35e62978 100644
--- a/Vocaluxe/Lib/Sound/Playback/CAudioStreamBase.cs
+++ b/Vocaluxe/Lib/Sound/Playback/CAudioStreamBase.cs
@@ -25,6 +25,7 @@ namespace Vocaluxe.Lib.Sound.Playback
         private readonly int _ID;
         protected readonly string _Medium;
         protected readonly bool _Loop;
+        protected readonly EAudioEffect _Effect;
 
         protected ICloseStreamListener _CloseStreamListener;
 
@@ -48,11 +49,12 @@ namespace Vocaluxe.Lib.Sound.Playback
         public abstract bool IsPaused { get; set; }
         public abstract bool IsFinished { get; }
 
-        protected CAudioStreamBase(int id, string medium, bool loop)
+        protected CAudioStreamBase(int id, string medium, bool loop, EAudioEffect effect = EAudioEffect.None)
         {
             _ID = id;
             _Medium = medium;
             _Loop = loop;
+            _Effect = effect;
         }
 
         ~CAudioStreamBase()
diff --git a/Vocaluxe/Lib/Sound/Playback/CPlaybackBase.cs b/Vocaluxe/Lib/Sound/Playback/CPlaybackBase.cs
index 1a12441c..62bbec70 100644
--- a/Vocaluxe/Lib/Sound/Playback/CPlaybackBase.cs
+++ b/Vocaluxe/Lib/Sound/Playback/CPlaybackBase.cs
@@ -113,13 +113,13 @@ namespace Vocaluxe.Lib.Sound.Playback
 
         #region Stream Handling
         //Factory method to get a stream instance
-        protected abstract IAudioStream _CreateStream(int id, string media, bool loop);
+        protected abstract IAudioStream _CreateStream(int id, string media, bool loop, EAudioEffect effect = EAudioEffect.None);
 
-        public int Load(string medium, bool loop = false, bool prescan = false)
+        public int Load(string medium, bool loop = false, bool prescan = false, EAudioEffect effect = EAudioEffect.None)
         {
             if (!_Initialized)
                 return -1;
-            IAudioStream stream = _CreateStream(_NextID++, medium, loop);
+            IAudioStream stream = _CreateStream(_NextID++, medium, loop, effect);
 
             if (stream.Open(prescan))
             {
diff --git a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
index 73c624f8..46fcfd3b 100644
--- a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
+++ b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
@@ -72,9 +72,9 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
             Application.Deinit();
         }
 
-        protected override IAudioStream _CreateStream(int id, string media, bool loop)
+        protected override IAudioStream _CreateStream(int id, string media, bool loop, EAudioEffect effect = EAudioEffect.None)
         {
-            return new CGstreamerSharpAudioStream(id, media, loop);
+            return new CGstreamerSharpAudioStream(id, media, loop, effect);
         }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs
index 97a432b0..09248e60 100644
--- a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs
+++ b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs
@@ -102,7 +102,7 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
             }
         }
 
-        public CGstreamerSharpAudioStream(int id, string medium, bool loop) : base(id, medium, loop) {}
+        public CGstreamerSharpAudioStream(int id, string medium, bool loop, EAudioEffect effect = EAudioEffect.None) : base(id, medium, loop, effect) {}
 
         public override bool Open(bool prescan)
         {
@@ -125,7 +125,7 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
 
             var audioSinkBin = new Bin("Audiosink");
             Element audiokaraoke = null;
-            if (CConfig.Config.Sound.KaraokeEffect == EOffOn.TR_CONFIG_ON)
+            if (_Effect.HasFlag(EAudioEffect.Karaoke))
             {
                 audiokaraoke = ElementFactory.Make("audiokaraoke", "karaoke");
                 audioSinkBin.Add(audiokaraoke);
diff --git a/Vocaluxe/Lib/Sound/Playback/IPlayback.cs b/Vocaluxe/Lib/Sound/Playback/IPlayback.cs
index 7bb4a9ad..20792586 100644
--- a/Vocaluxe/Lib/Sound/Playback/IPlayback.cs
+++ b/Vocaluxe/Lib/Sound/Playback/IPlayback.cs
@@ -36,7 +36,7 @@ namespace Vocaluxe.Lib.Sound.Playback
         void CloseAll();
 
         #region stream Handling
-        int Load(string medium, bool loop = false, bool prescan = false);
+        int Load(string medium, bool loop = false, bool prescan = false, EAudioEffect effekt= EAudioEffect.None);
         void Close(int streamID);
 
         void Play(int streamID);
diff --git a/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenALPlay.cs b/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenALPlay.cs
index 74a3704e..13ee98ad 100644
--- a/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenALPlay.cs
+++ b/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenALPlay.cs
@@ -44,9 +44,9 @@ namespace Vocaluxe.Lib.Sound.Playback.OpenAL
             _Context = null;
         }
 
-        protected override IAudioStream _CreateStream(int id, string media, bool loop)
+        protected override IAudioStream _CreateStream(int id, string media, bool loop, EAudioEffect effect = EAudioEffect.None)
         {
-            return new COpenAlStream(id, media, loop);
+            return new COpenAlStream(id, media, loop, effect);
         }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenAlStream.cs b/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenAlStream.cs
index f9b5f41d..fd22e07c 100644
--- a/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenAlStream.cs
+++ b/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenAlStream.cs
@@ -122,7 +122,7 @@ namespace Vocaluxe.Lib.Sound.Playback.OpenAL
             }
         }
 
-        public COpenAlStream(int id, string medium, bool loop) : base(id, medium, loop) {}
+        public COpenAlStream(int id, string medium, bool loop, EAudioEffect effect = EAudioEffect.None) : base(id, medium, loop, effect) {}
 
         protected override void _Dispose(bool disposing)
         {
diff --git a/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioPlay.cs b/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioPlay.cs
index e96eeeab..f5110988 100644
--- a/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioPlay.cs
+++ b/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioPlay.cs
@@ -29,9 +29,9 @@ namespace Vocaluxe.Lib.Sound.Playback.PortAudio
             return true;
         }
 
-        protected override IAudioStream _CreateStream(int id, string media, bool loop)
+        protected override IAudioStream _CreateStream(int id, string media, bool loop, EAudioEffect effect = EAudioEffect.None)
         {
-            return new CPortAudioStream(id, media, loop);
+            return new CPortAudioStream(id, media, loop, effect);
         }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioStream.cs b/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioStream.cs
index 34421547..2002aa9c 100644
--- a/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioStream.cs
+++ b/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioStream.cs
@@ -131,7 +131,7 @@ namespace Vocaluxe.Lib.Sound.Playback.PortAudio
             }
         }
 
-        public CPortAudioStream(int id, string medium, bool loop) : base(id, medium, loop) {}
+        public CPortAudioStream(int id, string medium, bool loop, EAudioEffect effect = EAudioEffect.None) : base(id, medium, loop, effect) {}
 
         public override bool Open(bool prescan)
         {
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 829c69d1..7bf7e042 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -24,6 +24,7 @@ using System.Linq;
 using System.Windows.Forms;
 using Vocaluxe.Base;
 using Vocaluxe.Base.Fonts;
+using Vocaluxe.Lib.Sound;
 using VocaluxeLib;
 using VocaluxeLib.Draw;
 using VocaluxeLib.Menu;
@@ -525,7 +526,7 @@ namespace Vocaluxe.Screens
                 songname += " (" + CGame.RoundNr + "/" + rounds + ")";
             _Texts[_TextSongName].Text = songname;
 
-            _CurrentStream = CSound.Load(song.GetMP3(), false, true);
+            _CurrentStream = CSound.Load(song.GetMP3(), false, true, CConfig.Config.Sound.KaraokeEffect == EOffOn.TR_CONFIG_ON ? EAudioEffect.Karaoke : EAudioEffect.None);
             CSound.SetStreamVolume(_CurrentStream, 100);
             CSound.SetPosition(_CurrentStream, song.Start);
             _CurrentTime = song.Start;
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index 00fca9f4..4109a99a 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -185,6 +185,7 @@
     <Compile Include="Lib\Draw\CTextureBase.cs" />
     <Compile Include="Lib\Draw\CTextureProvider.cs" />
     <Compile Include="Lib\Input\CGamePad.cs" />
+    <Compile Include="Lib\Sound\EAudioEffect.cs" />
     <Compile Include="Lib\Sound\Playback\CAudioStreamBase.cs" />
     <Compile Include="Lib\Sound\Playback\CPlaybackBase.cs" />
     <Compile Include="Lib\Sound\Playback\CRingBuffer.cs" />

From ee9b0af7d685dbb0bdde336ee20383db740b10bd Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Fri, 9 Sep 2016 16:10:18 +0200
Subject: [PATCH 12/44] -Mod: Increment theme version number

---
 Output/Themes/Ambient.xml                              |  2 +-
 Output/Themes/Ambient/Screens/ScreenOptionsSound.xml   |  2 +-
 .../Themes/Changelog/Changelog_ScreenOptionsSound.txt  | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Output/Themes/Ambient.xml b/Output/Themes/Ambient.xml
index 91b0c674..8eaa61cd 100644
--- a/Output/Themes/Ambient.xml
+++ b/Output/Themes/Ambient.xml
@@ -5,7 +5,7 @@
     <Name>Ambient</Name>
     <Author>bohning</Author>
     <VersionMajor>0</VersionMajor>
-    <VersionMinor>2</VersionMinor>
+    <VersionMinor>3</VersionMinor>
   </Info>
   <Cursor>
     <Skin>Cursor</Skin>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
index a42fd2b5..9929150b 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
@@ -2,7 +2,7 @@
 <Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Informations>
     <ScreenName>ScreenOptionsSound</ScreenName>
-    <ScreenVersion>3</ScreenVersion>
+    <ScreenVersion>4</ScreenVersion>
   </Informations>
   <Backgrounds>
     <Background Name="Background1">
diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsSound.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsSound.txt
index d83bd921..f12bf489 100644
--- a/Output/Themes/Changelog/Changelog_ScreenOptionsSound.txt
+++ b/Output/Themes/Changelog/Changelog_ScreenOptionsSound.txt
@@ -1,5 +1,15 @@
 ScreenOptionsSound
 
+++++++++++
+Version 4:
+
+Add:
+
+<SelectSlideKaraokeEffect>
+
+and text for the description (Text7)
+"TR_SCREENOSOUND_KARAOKEEFFECT"
+
 ++++++++++
 Version 3:
 

From 82a2a552dbc2c70f1f6ba583e10717689d883eeb Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Fri, 9 Sep 2016 16:52:45 +0200
Subject: [PATCH 13/44] Fix: EAudioEffect.cs is missing

---
 Vocaluxe/Lib/Sound/EAudioEffect.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 Vocaluxe/Lib/Sound/EAudioEffect.cs

diff --git a/Vocaluxe/Lib/Sound/EAudioEffect.cs b/Vocaluxe/Lib/Sound/EAudioEffect.cs
new file mode 100644
index 00000000..cc85a9cf
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/EAudioEffect.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Vocaluxe.Lib.Sound
+{
+    [Flags]
+    public enum EAudioEffect
+    {
+        None = 0,
+        Karaoke = 1
+    }
+}

From 7f5252099618a4581dc637cd58f0521433e172bc Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Fri, 9 Sep 2016 16:59:00 +0200
Subject: [PATCH 14/44] Mod: theme version numbers the 2nd

---
 Output/Themes/Ambient.xml               | 2 +-
 Vocaluxe/Screens/CScreenOptionsSound.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Output/Themes/Ambient.xml b/Output/Themes/Ambient.xml
index 8eaa61cd..91b0c674 100644
--- a/Output/Themes/Ambient.xml
+++ b/Output/Themes/Ambient.xml
@@ -5,7 +5,7 @@
     <Name>Ambient</Name>
     <Author>bohning</Author>
     <VersionMajor>0</VersionMajor>
-    <VersionMinor>3</VersionMinor>
+    <VersionMinor>2</VersionMinor>
   </Info>
   <Cursor>
     <Skin>Cursor</Skin>
diff --git a/Vocaluxe/Screens/CScreenOptionsSound.cs b/Vocaluxe/Screens/CScreenOptionsSound.cs
index 6d3c1fde..c3d47d1f 100644
--- a/Vocaluxe/Screens/CScreenOptionsSound.cs
+++ b/Vocaluxe/Screens/CScreenOptionsSound.cs
@@ -27,7 +27,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 3; }
+            get { return 4; }
         }
 
         private const string _SelectSlideBackgroundMusic = "SelectSlideBackgroundMusic";

From 561dadb67a13b046c681b597d4b91f7963d4f721 Mon Sep 17 00:00:00 2001
From: lukeIam <lukeIam@users.noreply.github.com>
Date: Fri, 9 Sep 2016 21:07:45 +0200
Subject: [PATCH 15/44] Windows/Appveyor CI build improvements

-Fix: Nightly tag is moved even if the build fails (fixes #171)
-Mod: Improved log messages
-Add: Adjustments to allow forks to run appveyor.yml on their instances
-Add: Custom names for custom builds
---
 appveyor.yml | 59 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 21 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 16ad3883..520b55f8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,47 +11,62 @@ environment:
   GitHubKey:
     secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW
 install:
-- ps: >-
+- ps: |
     $Env:CurrentCommitSha = "$(git rev-parse --verify HEAD)"
 
-    $Env:githubRepoApiUri = "https://api.github.com/repos/Vocaluxe/Vocaluxe/"
+    if((-not $Env:githubRepoApiUri) -or ($Env:APPVEYOR_ACCOUNT_NAME -eq "VocaluxeBuildBot")){
+        $Env:githubRepoApiUri = "https://api.github.com/repos/Vocaluxe/Vocaluxe/"
+    }
+
+    Write-Host "GitHub api url: $Env:githubRepoApiUri"
 
     ./.appveyor/gitDescribe.ps1
-
-    $Env:GIT_VERSION_TAG = $Env:VersionTag
+    
+    $Env:GIT_VERSION_TAG = $Env:VersionTag    
+    Write-Host "GIT_VERSION_TAG: $Env:GIT_VERSION_TAG"
 
     if($Env:APPVEYOR_REPO_TAG -eq "true"){
-
-    $Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_TAG_NAME
-
+        $Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_TAG_NAME 
     }
-
     else{
-
-    $Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_BRANCH
-
-    }
-
-    ./.appveyor/moveTagForSpecialBranches.ps1
+        $Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_BRANCH
+    }    
 before_build:
 - ps: >-
     nuget restore -DisableParallelProcessing
 
-    #(Get-Content -Encoding UTF8 'PitchTracker\PitchTracker.vcxproj') | Foreach-Object {$_ -replace 'v110_xp', 'v120_xp'} | Set-Content -Encoding UTF8 'PitchTracker\PitchTracker.vcxproj'
 build:
   project: Vocaluxe.sln
   verbosity: normal
 after_build:
-- ps: >-
+- ps: |
     cd Output
 
-    7z a "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM).zip" *
+    $Env:MAIN_REPO = $False
 
-    appveyor PushArtifact "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM).zip" -FileName "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM).zip" -DeploymentName ReleaseZip
+    if($Env:APPVEYOR_REPO_NAME -eq "Vocaluxe/Vocaluxe"){
+        $Env:MAIN_REPO = $True
+        Write-Host "Main repo Vocaluxe/Vocaluxe detected"
+    }
+
+    $forkBuildTag = ""
+    if(($Env:MAIN_REPO -ne $True) -or ($Env:APPVEYOR_ACCOUNT_NAME -ne "VocaluxeBuildBot")){
+        $forkBuildTag = "_non-official-by-$Env:APPVEYOR_ACCOUNT_NAME"
+        Write-Host "Non official build detected: $Env:APPVEYOR_REPO_NAME by $Env:APPVEYOR_ACCOUNT_NAME"
+    }
+
+    7z a "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip" *
+
+    appveyor PushArtifact "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip" -FileName "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip" -DeploymentName ReleaseZip
 
     cd ..
-
-    .\.appveyor\nightlyDetect.ps1
+    
+    Write-Host "Created artifact: Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip"
+    
+    if($Env:MAIN_REPO -eq $True){
+        .\.appveyor\nightlyDetect.ps1
+        .\.appveyor\moveTagForSpecialBranches.ps1
+    }
 test: off
 before_deploy:
 - ps: ./.appveyor/prepareDeploy.ps1
@@ -67,6 +82,7 @@ deploy:
   on:
     APPVEYOR_REPO_TAG: true
     NIGHTLY_BUILD: false
+    MAIN_REPO: true
 - provider: GitHub
   tag: $(APPVEYOR_REPO_TAG_NAME)
   release: Latest Nightly build
@@ -76,4 +92,5 @@ deploy:
   artifact: ReleaseZip
   on:
     APPVEYOR_REPO_TAG: true
-    NIGHTLY_BUILD: true
\ No newline at end of file
+    NIGHTLY_BUILD: true
+    MAIN_REPO: true
\ No newline at end of file

From 6b9d8b257348c2b03588a1eda26502ac22bec92c Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Sun, 11 Sep 2016 15:24:33 +0200
Subject: [PATCH 16/44] Add: English translation for
 TR_SCREENOSOUND_KARAOKEEFFECT

---
 Output/Languages/English.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml
index c3aefaf8..2cd71c39 100644
--- a/Output/Languages/English.xml
+++ b/Output/Languages/English.xml
@@ -204,6 +204,7 @@
   <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Background-music source</string>
   <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Preview-music volume</string>
   <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Game-music volume</string>
+  <string name="TR_SCREENOSOUND_KARAOKEEFFECT">Karaoke effect</string>
   <string name="TR_SCREENOTHEME_OPTIONS">Theme Options</string>
   <string name="TR_SCREENOTHEME_THEME">Theme</string>
   <string name="TR_SCREENOTHEME_SKIN">Skin</string>

From 9504bc385093806f702de3e49f56aef70f573f8c Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Wed, 7 Sep 2016 17:20:24 +0200
Subject: [PATCH 17/44] Mod: Updated nuget-packages for acinerella, ffmpeg,
 gstreamer, hidapi (no file copy under Linux)

---
 Vocaluxe/Vocaluxe.csproj | 20 ++++++++++----------
 Vocaluxe/packages.config | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index 4109a99a..dba66ce1 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -536,31 +536,31 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Rebuild for automatic package restore. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.1\build\vocaluxe.dependencies.acinerella.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.acinerella.1.0.1\build\vocaluxe.dependencies.acinerella.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.1\build\vocaluxe.dependencies.ffmpeg.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.ffmpeg.1.0.1\build\vocaluxe.dependencies.ffmpeg.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.3\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.3\build\vocaluxe.dependencies.hidapi.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.8\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.8\build\vocaluxe.dependencies.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets'))" />
   </Target>
-  <Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.1\build\vocaluxe.dependencies.acinerella.targets" Condition="Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.1\build\vocaluxe.dependencies.acinerella.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets" Condition="Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets" Condition="Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.ffmpeg.1.0.1\build\vocaluxe.dependencies.ffmpeg.targets" Condition="Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.1\build\vocaluxe.dependencies.ffmpeg.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets" Condition="Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.3\build\vocaluxe.dependencies.hidapi.targets" Condition="Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.3\build\vocaluxe.dependencies.hidapi.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets" Condition="Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets" Condition="Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets" Condition="Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets" Condition="Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.1.0.8\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.8\build\vocaluxe.dependencies.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Vocaluxe/packages.config b/Vocaluxe/packages.config
index 491119d1..de718055 100644
--- a/Vocaluxe/packages.config
+++ b/Vocaluxe/packages.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="vocaluxe.dependencies" version="1.0.8" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.acinerella" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies" version="1.0.9" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.acinerella" version="1.0.3" targetFramework="net40" />
   <package id="vocaluxe.dependencies.aforgevideo" version="1.0.1" targetFramework="net40" />
   <package id="vocaluxe.dependencies.csharpsqlite" version="1.0.1" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.ffmpeg" version="1.0.1" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.gstreamer" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.ffmpeg" version="1.0.3" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.gstreamer" version="1.0.2" targetFramework="net40" />
   <package id="vocaluxe.dependencies.gstreamersharp" version="1.0.1" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.hidapi" version="1.0.3" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.hidapi" version="1.0.4" targetFramework="net40" />
   <package id="vocaluxe.dependencies.opentk" version="1.0.1" targetFramework="net40" />
   <package id="vocaluxe.dependencies.portaudiosharp" version="1.0.1" targetFramework="net40" />
   <package id="vocaluxe.dependencies.qrcoder" version="1.0.1" targetFramework="net40" />

From fab0b8c3dcf7fbb403a7c0c2ecc8572934024e51 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Wed, 7 Sep 2016 18:08:15 +0200
Subject: [PATCH 18/44] Mod: Removed error if nuget packages acinerella,
 ffmpeg, gstreamer, hidapi are not imported under linux

---
 Vocaluxe/Vocaluxe.csproj | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index dba66ce1..cfe1bfc4 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -536,31 +536,31 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Rebuild for automatic package restore. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets'))" />
+    <Error Condition="'$(OS)' == 'Windows_NT' AND !Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets'))" />
+    <Error Condition="'$(OS)' == 'Windows_NT' AND !Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets'))" />
+    <Error Condition="'$(OS)' == 'Windows_NT' AND !Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets'))" />
+    <Error Condition="'$(OS)' == 'Windows_NT' AND !Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets'))" />
   </Target>
-  <Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets" Condition="Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets" Condition="'$(OS)' == 'Windows_NT' AND Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets" Condition="Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets" Condition="Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets" Condition="'$(OS)' == 'Windows_NT' AND Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets" Condition="Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets" Condition="'$(OS)' == 'Windows_NT' AND Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets" Condition="Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets" Condition="Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets" Condition="Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets" Condition="'$(OS)' == 'Windows_NT' AND Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets')" />
 </Project>
\ No newline at end of file

From 3f5cb818a228536e789d4b033f6e302c7c66f62d Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Wed, 7 Sep 2016 18:34:08 +0200
Subject: [PATCH 19/44] Mod: Changed dependecy linux detection from compiling
 system to target configuration

---
 Vocaluxe/Vocaluxe.csproj | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index cfe1bfc4..34a3bc23 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -536,31 +536,31 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Rebuild for automatic package restore. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="'$(OS)' == 'Windows_NT' AND !Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets'))" />
+    <Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets'))" />
-    <Error Condition="'$(OS)' == 'Windows_NT' AND !Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets'))" />
+    <Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets'))" />
-    <Error Condition="'$(OS)' == 'Windows_NT' AND !Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets'))" />
+    <Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets'))" />
-    <Error Condition="'$(OS)' == 'Windows_NT' AND !Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets'))" />
+    <Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets'))" />
   </Target>
-  <Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets" Condition="'$(OS)' == 'Windows_NT' AND Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets" Condition="Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets" Condition="'$(OS)' == 'Windows_NT' AND Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.3\build\vocaluxe.dependencies.ffmpeg.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets" Condition="'$(OS)' == 'Windows_NT' AND Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets" Condition="Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets" Condition="Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets" Condition="Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets" Condition="'$(OS)' == 'Windows_NT' AND Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets')" />
 </Project>
\ No newline at end of file

From 1a85f56fb4820a07c7b9db88386bc652fbc441e4 Mon Sep 17 00:00:00 2001
From: derivator <derivator@users.noreply.github.com>
Date: Tue, 18 Oct 2016 17:41:02 +0200
Subject: [PATCH 20/44] Partymodes: Fix "Select random" button selecting
 invalid profiles

which would happen if the number of visible profiles matched the number of used profiles or if there were more slots than usable profiles
---
 VocaluxeLib/Menu/CMenuPartyNameSelection.cs |  3 ++-
 VocaluxeLib/Menu/CNameSelection.cs          | 18 +++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
index 423d89e8..92527d08 100644
--- a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
+++ b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
@@ -774,7 +774,8 @@ namespace VocaluxeLib.Menu
                 for (int p = 0; p < _NumPlayerTeams[t]; p++)
                 {
                     int profileID = _NameSelections[_NameSelection].GetRandomUnusedProfile();
-                    _AddPlayer(t, profileID);
+                    if(profileID >= 0) //only add valid profiles
+                        _AddPlayer(t, profileID);
                 }
             }
         }
diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs
index 37806b5f..1718d047 100644
--- a/VocaluxeLib/Menu/CNameSelection.cs
+++ b/VocaluxeLib/Menu/CNameSelection.cs
@@ -465,23 +465,11 @@ namespace VocaluxeLib.Menu
 
         public int GetRandomUnusedProfile()
         {
-            int id = -1;
-
             if (_VisibleProfiles.Count == 0)
-                return id;
+                return -1;
 
-            if (_VisibleProfiles.Count == _UsedProfiles.Count)
-                return id;
-
-            while (id == -1)
-            {
-                int rand = CBase.Game.GetRandom(_VisibleProfiles.Count);
-                if (_UsedProfiles.Contains(_VisibleProfiles[rand]))
-                    continue;
-                id = _VisibleProfiles[rand];
-            }
-
-            return id;
+            int rand = CBase.Game.GetRandom(_VisibleProfiles.Count);
+            return _VisibleProfiles[rand];
         }
 
         private void _PrepareTiles()

From 1b3b1467b18567d2e69158a49c67cfce16bca703 Mon Sep 17 00:00:00 2001
From: derivator <derivator@users.noreply.github.com>
Date: Tue, 18 Oct 2016 17:48:49 +0200
Subject: [PATCH 21/44] Partymodes: Reveal/hide "Next" button when the number
 of player slots changes

---
 VocaluxeLib/Menu/CMenuPartyNameSelection.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
index 92527d08..09b96cad 100644
--- a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
+++ b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
@@ -618,6 +618,7 @@ namespace VocaluxeLib.Menu
                 _UpdatePlayerSlide();
             }
             _UpdateButtonState();
+            _UpdateNextButtonVisibility();
         }
 
         public void DecreasePlayerNum(int team)
@@ -633,6 +634,7 @@ namespace VocaluxeLib.Menu
                 _UpdatePlayerSlide();
             }
             _UpdateButtonState();
+            _UpdateNextButtonVisibility();
         }
 
         #region private methods

From b71ca62fba61b0db6852e2059c47b427687b336b Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Tue, 18 Oct 2016 20:01:22 +0200
Subject: [PATCH 22/44] Mod: copy PortAudioSharp.dll.config to lib/managed by
 using a new nuget package (required for LinuxBuild)

---
 Vocaluxe/Vocaluxe.csproj | 8 ++++----
 Vocaluxe/packages.config | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index 34a3bc23..fc607fd5 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -543,12 +543,12 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets'))" />
     <Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets'))" />
     <Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.10\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.10\build\vocaluxe.dependencies.targets'))" />
   </Target>
   <Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.3\build\vocaluxe.dependencies.acinerella.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets" Condition="Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" />
@@ -557,10 +557,10 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
   <Import Project="..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets" Condition="Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets" Condition="Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets" Condition="Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.9\build\vocaluxe.dependencies.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.1.0.10\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.10\build\vocaluxe.dependencies.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Vocaluxe/packages.config b/Vocaluxe/packages.config
index de718055..b9d40591 100644
--- a/Vocaluxe/packages.config
+++ b/Vocaluxe/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="vocaluxe.dependencies" version="1.0.9" targetFramework="net40" />
+  <package id="vocaluxe.dependencies" version="1.0.10" targetFramework="net40" />
   <package id="vocaluxe.dependencies.acinerella" version="1.0.3" targetFramework="net40" />
   <package id="vocaluxe.dependencies.aforgevideo" version="1.0.1" targetFramework="net40" />
   <package id="vocaluxe.dependencies.csharpsqlite" version="1.0.1" targetFramework="net40" />
@@ -9,7 +9,7 @@
   <package id="vocaluxe.dependencies.gstreamersharp" version="1.0.1" targetFramework="net40" />
   <package id="vocaluxe.dependencies.hidapi" version="1.0.4" targetFramework="net40" />
   <package id="vocaluxe.dependencies.opentk" version="1.0.1" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.portaudiosharp" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.portaudiosharp" version="1.0.2" targetFramework="net40" />
   <package id="vocaluxe.dependencies.qrcoder" version="1.0.1" targetFramework="net40" />
   <package id="vocaluxe.dependencies.slimdx" version="1.0.1" targetFramework="net40" />
   <package id="vocaluxe.dependencies.sqlite" version="1.0.1" targetFramework="net40" />

From 8e4129b941a1a9ee065fe1da86488b7455bd6c90 Mon Sep 17 00:00:00 2001
From: derivator <derivator@users.noreply.github.com>
Date: Wed, 19 Oct 2016 15:46:42 +0200
Subject: [PATCH 23/44] Partymodes: fix compilation on linux

Use Path.Combine for portability, because linux doesn't like backslashes in paths
---
 Vocaluxe/Base/CParty.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vocaluxe/Base/CParty.cs b/Vocaluxe/Base/CParty.cs
index f8e498c8..f8126737 100644
--- a/Vocaluxe/Base/CParty.cs
+++ b/Vocaluxe/Base/CParty.cs
@@ -283,7 +283,7 @@ namespace Vocaluxe.Base
             compilerParams.ReferencedAssemblies.Add("System.Windows.Forms.dll");
             compilerParams.ReferencedAssemblies.Add("System.dll");
             compilerParams.ReferencedAssemblies.Add("System.Core.dll");
-            compilerParams.ReferencedAssemblies.Add("libs\\managed\\VocaluxeLib.dll");
+            compilerParams.ReferencedAssemblies.Add(Path.Combine("libs","managed","VocaluxeLib.dll"));
             compilerParams.GenerateInMemory = true;
 #if DEBUG
             compilerParams.IncludeDebugInformation = true;

From 81fca1c991213b37da9297abe7f8ab71cb5fac22 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Fri, 18 Nov 2016 17:31:58 +0100
Subject: [PATCH 24/44] Add new IntelliSense database files to gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index f9e43ee9..c94abcde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,8 @@ tx.exe
 *.vshost.*
 *.userprefs
 *.user
+*.VC.db
+*.VC.opendb
 /*.vsp
 /*.ctl
 /Output/Config.xml

From a61f5ea44821c16e548f70ffefeb9c744e71b36e Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Fri, 18 Nov 2016 17:54:07 +0100
Subject: [PATCH 25/44] Add /PitchTracker/bin and /PitchTracker/obj to
 gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index c94abcde..9de55a61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,5 @@ tx.exe
 /packages
 /Output/x64
 /Output/x86
+/PitchTracker/bin
+/PitchTracker/obj

From 3c7f69675640df264d1ce4315821ed32849ce6b3 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Sat, 19 Nov 2016 19:29:42 +0100
Subject: [PATCH 26/44] Fix: Scrolling issue when changing from long list to
 short list - reset scrolling if the list is changed (fixes #217)

---
 VocaluxeLib/Menu/CPlaylist.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs
index eea30f1a..96a411cb 100644
--- a/VocaluxeLib/Menu/CPlaylist.cs
+++ b/VocaluxeLib/Menu/CPlaylist.cs
@@ -1087,6 +1087,7 @@ namespace VocaluxeLib.Menu
                     };
                 _PlaylistElementContents.Add(pec);
             }
+            _SetSelectionToFirstEntry();
             _Update();
             return true;
         }

From 4f990e6306bf50d391af0a87c784b23d13a1f99a Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Mon, 21 Nov 2016 20:10:16 +0100
Subject: [PATCH 27/44] Fix: After deleting a playlist the playlist-selector is
 out of sync (maybe a fix for #209)

---
 Vocaluxe/Base/CPlaylists.cs      |  5 +++++
 Vocaluxe/Screens/CScreenSong.cs  | 30 +++++++++++++++---------------
 VocaluxeLib/Menu/CSelectSlide.cs | 24 ++++++++++++++++++++----
 3 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/Vocaluxe/Base/CPlaylists.cs b/Vocaluxe/Base/CPlaylists.cs
index f2f84ed8..9cc3201a 100644
--- a/Vocaluxe/Base/CPlaylists.cs
+++ b/Vocaluxe/Base/CPlaylists.cs
@@ -42,6 +42,11 @@ namespace Vocaluxe.Base
             get { return _Playlists.Select(t => t.Name).ToList(); }
         }
 
+        public static List<int> Ids
+        {
+            get { return _Playlists.Select(t => t.Id).ToList(); }
+        }
+
         public static int NumPlaylists
         {
             get { return _Playlists.Count; }
diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs
index 5d49a606..c14037ba 100644
--- a/Vocaluxe/Screens/CScreenSong.cs
+++ b/Vocaluxe/Screens/CScreenSong.cs
@@ -372,9 +372,9 @@ namespace Vocaluxe.Screens
                         else if (_Buttons[_ButtonOptionsOpenSelectedItem].Selected)
                             _HandleSelectButton();
                         else if (_SelectSlides[_SelectSlideOptionsPlaylistOpen].Selected)
-                            _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistOpen].Selection);
+                            _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistOpen].SelectedTag);
                         else if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selected)
-                            _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1);
+                            _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag);
                         else if (_Buttons[_ButtonOptionsRandomMedley].Selected)
                             _ToggleSongOptions(ESongOptionsView.Medley);
                         else if (_Buttons[_ButtonOptionsStartMedley].Selected)
@@ -533,12 +533,12 @@ namespace Vocaluxe.Screens
                     }
                     else if (_SelectSlides[_SelectSlideOptionsPlaylistOpen].IsValueSelected)
                     {
-                        _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistOpen].Selection);
+                        _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistOpen].SelectedTag);
                         return true;
                     }
                     else if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].IsValueSelected)
                     {
-                        _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1);
+                        _OpenPlaylist(_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag);
                         return true;
                     }
                     else if (_Buttons[_ButtonOptionsRandomMedley].Selected)
@@ -1279,16 +1279,16 @@ namespace Vocaluxe.Screens
         private void _UpdatePlaylistNames()
         {
             _SelectSlides[_SelectSlideOptionsPlaylistAdd].Clear();
-            _SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue("TR_SCREENSONG_NEWPLAYLIST");
-            _SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValues(CPlaylists.Names);
+            _SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue("TR_SCREENSONG_NEWPLAYLIST", tag: -1);
+            _SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValues(CPlaylists.Names, CPlaylists.Ids);
             _SelectSlides[_SelectSlideOptionsPlaylistOpen].Clear();
-            _SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValues(CPlaylists.Names);
+            _SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValues(CPlaylists.Names, CPlaylists.Ids);
         }
 
         private void _OpenAndAddPlaylistAction()
         {
-            if (_Playlist.ActivePlaylistID != (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) &&
-                (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) != -1)
+            if (_Playlist.ActivePlaylistID != (_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag) &&
+                (_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag) != -1)
             {
                 //Open an existing playlist and add song
                 //Check selected game-mode
@@ -1301,9 +1301,9 @@ namespace Vocaluxe.Screens
                     gm = EGameMode.TR_GAMEMODE_NORMAL;
 
                 //Check if Playlist really exists
-                if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1 >= 0)
+                if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag >= 0)
                 {
-                    _Playlist.ActivePlaylistID = _SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1;
+                    _Playlist.ActivePlaylistID = _SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag;
 
                     //Add song to playlist
                     CPlaylists.AddSong(_Playlist.ActivePlaylistID, CSongs.VisibleSongs[_SongMenu.GetPreviewSongNr()].ID, gm);
@@ -1314,7 +1314,7 @@ namespace Vocaluxe.Screens
                     _Playlist.ScrollToBottom();
                 }
             }
-            else if ((_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) == -1)
+            else if ((_SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag) == -1)
             {
                 //Create a new playlist and add song
                 //Check selected game-mode
@@ -1336,8 +1336,8 @@ namespace Vocaluxe.Screens
                 _OpenPlaylist(_Playlist.ActivePlaylistID);
 
                 //Add new playlist to select-slide
-                _SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue(CPlaylists.GetName(_Playlist.ActivePlaylistID));
-                _SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValue(CPlaylists.GetName(_Playlist.ActivePlaylistID));
+                _SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue(CPlaylists.GetName(_Playlist.ActivePlaylistID), _Playlist.ActivePlaylistID);
+                _SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValue(CPlaylists.GetName(_Playlist.ActivePlaylistID), _Playlist.ActivePlaylistID);
             }
             else
             {
@@ -1359,7 +1359,7 @@ namespace Vocaluxe.Screens
         private void _SetSelectSlidePlaylistToCurrentPlaylist()
         {
             if (_Playlist.ActivePlaylistID > -1)
-                _SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection = _Playlist.ActivePlaylistID + 1;
+                _SelectSlides[_SelectSlideOptionsPlaylistAdd].SelectedTag = _Playlist.ActivePlaylistID;
             else
                 _SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection = 0;
         }
diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs
index 64f39b08..fa6310b2 100644
--- a/VocaluxeLib/Menu/CSelectSlide.cs
+++ b/VocaluxeLib/Menu/CSelectSlide.cs
@@ -436,6 +436,22 @@ namespace VocaluxeLib.Menu
                 AddValue(value);
         }
 
+        public void AddValues(IEnumerable<string> values, IEnumerable<int> tags)
+        {
+            using (var e1 = values.GetEnumerator())
+            using (var e2 = tags.GetEnumerator())
+            {
+                while (e1.MoveNext() && e2.MoveNext())
+                {
+                    AddValue(e1.Current, tag: e2.Current);
+                }
+                if (e1.MoveNext() || e2.MoveNext())
+                {
+                    throw new ArgumentException("the lists must have the same length");
+                }
+            }
+        }
+
         public void AddValues(string[] values, CTextureRef[] textures)
         {
             Debug.Assert(values.Length == textures.Length);
@@ -566,10 +582,10 @@ namespace VocaluxeLib.Menu
                 for (int i = 0; i < numvis; i++)
                 {
                     var el = new CElement
-                        {
-                            Text = new CText(0, 0, 0, _TextH, _MaxW, EAlignment.Center, _Theme.TextStyle, _Theme.TextFont, _TextColor, "T", _PartyModeID),
-                            Img = new CStatic(_PartyModeID)
-                        };
+                    {
+                        Text = new CText(0, 0, 0, _TextH, _MaxW, EAlignment.Center, _Theme.TextStyle, _Theme.TextFont, _TextColor, "T", _PartyModeID),
+                        Img = new CStatic(_PartyModeID)
+                    };
                     _VisibleElements.Add(el);
                 }
             }

From 78e2c50209740b80535c4e8de47c331b8e3210a5 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Wed, 23 Nov 2016 12:12:58 +0100
Subject: [PATCH 28/44] Fix: "1)" is fixed in PartyModeChallenge*'s roundtables
 (fixes #231)

---
 .../Themes/Default/Screens/PartyScreenChallengeMain.xml         | 2 +-
 .../Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
index 3edf6ca5..1c67c701 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
@@ -187,7 +187,7 @@
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text>1)</Text>
+      <Text />
     </Text>
     <Text Name="TextRoundPlayer">
       <X>0</X>
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
index 371c3e14..c1279d0d 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
@@ -187,7 +187,7 @@
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text>1)</Text>
+      <Text />
     </Text>
     <Text Name="TextRoundPlayer">
       <X>0</X>

From 557ba6207c5b122b3862d7422df7a36eb8d14f22 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Sun, 27 Nov 2016 13:55:42 +0100
Subject: [PATCH 29/44] Mod: Change gamepad's Abort/"Esc" button from "X" to
 "B" (as "B" is common key for aborting something)

---
 Vocaluxe/Lib/Input/CGamePad.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vocaluxe/Lib/Input/CGamePad.cs b/Vocaluxe/Lib/Input/CGamePad.cs
index 482dce1a..04810d7a 100644
--- a/Vocaluxe/Lib/Input/CGamePad.cs
+++ b/Vocaluxe/Lib/Input/CGamePad.cs
@@ -161,7 +161,7 @@ namespace Vocaluxe.Lib.Input
                 key = Keys.Space;
             else if (buttonStates.Buttons.A == OpenTK.Input.ButtonState.Pressed && _OldButtonStates.Buttons.A == OpenTK.Input.ButtonState.Released)
                 key = Keys.Enter;
-            else if (buttonStates.Buttons.X == OpenTK.Input.ButtonState.Pressed && _OldButtonStates.Buttons.X == OpenTK.Input.ButtonState.Released)
+            else if (buttonStates.Buttons.B == OpenTK.Input.ButtonState.Pressed && _OldButtonStates.Buttons.B == OpenTK.Input.ButtonState.Released)
                 key = Keys.Escape;
             else if (buttonStates.Buttons.Back == OpenTK.Input.ButtonState.Pressed && _OldButtonStates.Buttons.Back == OpenTK.Input.ButtonState.Released)
                 key = Keys.Back;

From 58bdabe62cec458c4247c7e513a84ca842f6fadd Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Sun, 27 Nov 2016 14:16:42 +0100
Subject: [PATCH 30/44] Fix: Can't select players if #player=12 in PartyModes
 (fixes #232)

---
 VocaluxeLib/Menu/CMenuPartyNameSelection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
index 09b96cad..489467bc 100644
--- a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
+++ b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs
@@ -727,7 +727,7 @@ namespace VocaluxeLib.Menu
         {
             if (_NumPlayerTeams[team] == _TeamList[team].Count && !_ChangePlayerNumDynamic)
                 return;
-            if (_NumPlayerTeams[team] == _PartyMode.MaxPlayersPerTeam)
+            if (_NumPlayerTeams[team] > _PartyMode.MaxPlayersPerTeam)
                 return;
 
             _NameSelections[_NameSelection].UseProfile(profileID);

From 6b89fdf8bb281d281e86eb40f2878c56dfe3e5a9 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Sat, 10 Dec 2016 18:36:16 +0100
Subject: [PATCH 31/44] -Mod: add ambient theme videos to all releases (closes
 #237)

---
 appveyor.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 520b55f8..e614e1a2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,7 +32,17 @@ install:
         $Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_BRANCH
     }    
 before_build:
-- ps: >-
+- ps: |
+    Try
+    {
+        Start-FileDownload 'https://github.com/lukeIam/VocaluxeDependencies/blob/master/zips/themes/vocaluxe.themes.ambient.video.zip?raw=true'
+        & 7z x '-aoa' '-oOutput/' './vocaluxe.themes.ambient.video.zip'
+        Remove-Item './vocaluxe.themes.ambient.video.zip'
+    }
+    Catch
+    {
+        Write-Warning "Ambient-Video download failed"
+    }
     nuget restore -DisableParallelProcessing
 
 build:

From 9d4a420ea2987370032f8cda0d4e3de7b422c000 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Mon, 12 Dec 2016 21:01:41 +0100
Subject: [PATCH 32/44] -Mod: New versioning scheme including type if
 type!=release -Mod: Show the same version tag everywhere -Mod: Automatically
 determinate release type depending on the new version-tag -Mod: Automatically
 determinate CodeName -Add: Code-name for the 0.4. releases

---
 Vocaluxe/Base/CSettings.cs             | 54 +++++++++++++++++++-------
 Vocaluxe/Linux/Build/PostBuildEvent.sh |  2 +
 Vocaluxe/Linux/Build/PreBuildEvent.sh  |  2 +
 Vocaluxe/Properties/AssemblyInfo.cs    |  6 +--
 Vocaluxe/Vocaluxe.csproj               |  4 +-
 5 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs
index 3ad3a4ef..94f38509 100644
--- a/Vocaluxe/Base/CSettings.cs
+++ b/Vocaluxe/Base/CSettings.cs
@@ -18,6 +18,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
 using VocaluxeLib;
@@ -53,10 +54,44 @@ namespace Vocaluxe.Base
         public static EProgramState ProgramState = EProgramState.Start;
 
         //Adjusting of programName and version now in the assembly config.
-        //I'd use the major and minor for Main releases, build number for every public release and revision for every bugfix version without any features
-        private const string _ProgramCodeName = "Shining Heaven";
+        private static readonly Dictionary<string,string> _CodeNames = new Dictionary<string, string>()
+        {
+            {"0.3.", "Shining Heaven"},
+            {"0.4.", "Blue Sunrise"}
+        }; 
 
-        public const ERevision VersionRevision = ERevision.Beta;
+        private static string _ProgramCodeName
+        {
+            get
+            {
+                var versionParts = Application.ProductVersion.Split('.');
+                string name;
+                _CodeNames.TryGetValue($"{versionParts[0]}.{versionParts[1]}.", out name);
+                if (name != null)
+                    return name;
+                return "Unnamed Version";
+            }
+        }
+
+        public static ERevision VersionRevision
+        {
+            get
+            {
+                if (_Version.ToLower().Contains("alpha"))
+                {
+                    return ERevision.Alpha;
+                }
+                if (_Version.ToLower().Contains("beta"))
+                {
+                    return ERevision.Beta;
+                }
+                if (_Version.ToLower().Contains("rc"))
+                {
+                    return ERevision.RC;
+                }
+                return ERevision.Release;
+            }
+        }
 
         public const int DatabaseHighscoreVersion = 3;
         public const int DatabaseCoverVersion = 1;
@@ -177,8 +212,7 @@ namespace Vocaluxe.Base
         {
             get
             {
-                Version v = _Assembly.Version;
-                return "v" + v.Major + "." + v.Minor + "." + v.Build;
+                return Application.ProductVersion.Split('-').First();
             }
         }
 
@@ -186,10 +220,8 @@ namespace Vocaluxe.Base
         {
             string version = _Version + " (" + _Arch + ")";
 
-            // ReSharper disable ConditionIsAlwaysTrueOrFalse
             if (VersionRevision != ERevision.Release)
             {
-                // ReSharper restore ConditionIsAlwaysTrueOrFalse
                 string gitversion = Application.ProductVersion;
                 version += " " + _GetVersionStatus() + String.Format(" ({0})", gitversion);
             }
@@ -200,10 +232,8 @@ namespace Vocaluxe.Base
         public static string GetFullVersionText()
         {
             string version = ProgramName;
-
-            // ReSharper disable ConditionIsAlwaysTrueOrFalse
+            
             if (_ProgramCodeName != "")
-                // ReSharper restore ConditionIsAlwaysTrueOrFalse
                 version += " \"" + _ProgramCodeName + "\"";
 
             return version + " " + _GetVersionText();
@@ -211,11 +241,9 @@ namespace Vocaluxe.Base
 
         private static string _GetVersionStatus()
         {
-            string result;
+            string result = "";
 
-            // ReSharper disable ConditionIsAlwaysTrueOrFalse
             if (VersionRevision != ERevision.Release)
-                // ReSharper restore ConditionIsAlwaysTrueOrFalse
                 result = Enum.GetName(typeof(ERevision), VersionRevision);
 
             return result;
diff --git a/Vocaluxe/Linux/Build/PostBuildEvent.sh b/Vocaluxe/Linux/Build/PostBuildEvent.sh
index c9c2d125..92b73c10 100755
--- a/Vocaluxe/Linux/Build/PostBuildEvent.sh
+++ b/Vocaluxe/Linux/Build/PostBuildEvent.sh
@@ -2,4 +2,6 @@
 PROJECT=$1
 cd $PROJECT
 sed -i -r -e 's/AssemblyInformationalVersion\(".*?"\)/AssemblyInformationalVersion("GITVERSION")/' $PROJECT/Properties/AssemblyInfo.cs
+sed -i -r -e 's/AssemblyVersion\(".*?"\)/AssemblyVersion("SHORTVERSION")/' $PROJECT/Properties/AssemblyInfo.cs
+sed -i -r -e 's/AssemblyFileVersion\(".*?"\)/AssemblyFileVersion("SHORTVERSION")/' $PROJECT/Properties/AssemblyInfo.cs
 sed -i -e 's/var matchingServerVersion = "";/var matchingServerVersion = "'$(git describe --long)'";/' $PROJECT/../Output/Website/js/main.js
diff --git a/Vocaluxe/Linux/Build/PreBuildEvent.sh b/Vocaluxe/Linux/Build/PreBuildEvent.sh
index 4d7c6ef7..9fe7bd5b 100755
--- a/Vocaluxe/Linux/Build/PreBuildEvent.sh
+++ b/Vocaluxe/Linux/Build/PreBuildEvent.sh
@@ -2,3 +2,5 @@
 PROJECT=$1
 cd $PROJECT
 sed -i -e s/GITVERSION/$(git describe --long)/ $PROJECT/Properties/AssemblyInfo.cs
+shortv=$(git describe --abbrev=0 | sed -e 's/alpha/0/' -e 's/beta/1/' -e 's/rc/2/')
+sed -i -e s/SHORTVERSION/${shortv}/ $PROJECT/Properties/AssemblyInfo.cs
diff --git a/Vocaluxe/Properties/AssemblyInfo.cs b/Vocaluxe/Properties/AssemblyInfo.cs
index 3e00fede..4cde4f89 100644
--- a/Vocaluxe/Properties/AssemblyInfo.cs
+++ b/Vocaluxe/Properties/AssemblyInfo.cs
@@ -27,7 +27,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Vocaluxe")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyCopyright("Copyright © 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -49,6 +49,6 @@ using System.Runtime.InteropServices;
 //      Revision
 //
 
-[assembly: AssemblyVersion("0.3.0.83")]
-[assembly: AssemblyFileVersion("0.3.0.83")]
+[assembly: AssemblyVersion("SHORTVERSION")]
+[assembly: AssemblyFileVersion("SHORTVERSION")]
 [assembly: AssemblyInformationalVersion("GITVERSION")]
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index fc607fd5..ef349b8e 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -479,12 +479,12 @@
   <PropertyGroup>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">xcopy /E /D /Y "$(ProjectDir)\Website" "$(SolutionDir)\PhoneGap"
 powershell -command "if($Env:GIT_VERSION_TAG) {$version = $Env:GIT_VERSION_TAG;} else {$version = git describe --long;}(Get-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js') |  Foreach-Object {$_ -replace '(?&lt;=var *matchingServerVersion * = *\")\w*(?=\" *;)', "$version"} | Set-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js'"
-powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace '(?&lt;=AssemblyInformationalVersion\()(.*)(?=\))', '\"GITVERSION\"'} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"</PostBuildEvent>
+powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace '(?&lt;=AssemblyInformationalVersion\(\").*(?=\")', 'GITVERSION'} | Foreach-Object {$_ -replace '(?&lt;=(AssemblyVersion|AssemblyFileVersion)\(\").*(?=\")', 'SHORTVERSION'} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs' "</PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">cp -ruT "$(ProjectDir)Website" "$(SolutionDir)/PhoneGap"</PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">$(ProjectDir)Linux/Build/PostBuildEvent.sh $(ProjectDir)</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">powershell -command "if($Env:GIT_VERSION_TAG) {$version = $Env:GIT_VERSION_TAG;} else {$version = git describe --long;} (Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace 'GITVERSION', $version} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"</PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">powershell -command " if($Env:GIT_VERSION_TAG) {$version = $Env:GIT_VERSION_TAG;} else {$version = git describe --long;} (Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace '(?&lt;=AssemblyInformationalVersion\(\").*(?=\")', $version} | Foreach-Object {$_ -replace '(?&lt;=(AssemblyVersion|AssemblyFileVersion)\(\").*(?=\")', $version.Split('-')[0].replace('alpha','0').replace('beta','1').replace('rc','2')} | Foreach-Object {$_ -replace '(?&lt;=AssemblyCopyright\(\".*)[0-9]+(?=\")', (Get-Date).Year} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs' "</PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">$(ProjectDir)Linux/Build/PreBuildEvent.sh $(ProjectDir)</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 66737611c3190f39932df8d1c30bdc1fe0eb48ef Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Mon, 12 Dec 2016 23:23:06 +0100
Subject: [PATCH 33/44] Fix: new versioning scheme failing with PR builds

---
 .appveyor/gitDescribe.ps1 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.appveyor/gitDescribe.ps1 b/.appveyor/gitDescribe.ps1
index 98fe26ca..3a144393 100644
--- a/.appveyor/gitDescribe.ps1
+++ b/.appveyor/gitDescribe.ps1
@@ -1,9 +1,3 @@
-if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
-{
-	$Env:VersionTag = "PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
-	Return $Env:VersionTag
-}
-
 $currentCommitSha = $Env:CurrentCommitSha
 $githubRepoApiUri = $Env:githubRepoApiUri #"https://api.github.com/repos/:user/:repo/"
 $Env:VersionTag = ""
@@ -59,5 +53,12 @@ if(!$latestTag){
 	Return ;
 }
 
-$Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-g$($currentCommitSha.Substring(0,7))"
+if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
+{
+	$Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
+}
+else
+{
+    $Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-g$($currentCommitSha.Substring(0,7))"
+}
 Return $Env:VersionTag

From b98a17ef53baa17547efe30875c4eb5b6a726f31 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Mon, 12 Dec 2016 23:28:15 +0100
Subject: [PATCH 34/44] Fix: pr builds to not have access to the user
 credentials for github api access -> use dummy version number for pr build

---
 .appveyor/gitDescribe.ps1 | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.appveyor/gitDescribe.ps1 b/.appveyor/gitDescribe.ps1
index 3a144393..2666c2b5 100644
--- a/.appveyor/gitDescribe.ps1
+++ b/.appveyor/gitDescribe.ps1
@@ -1,3 +1,9 @@
+if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
+{
+	$Env:VersionTag = "0.0.0.pr-na-PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
+	Return $Env:VersionTag
+}
+
 $currentCommitSha = $Env:CurrentCommitSha
 $githubRepoApiUri = $Env:githubRepoApiUri #"https://api.github.com/repos/:user/:repo/"
 $Env:VersionTag = ""
@@ -53,12 +59,5 @@ if(!$latestTag){
 	Return ;
 }
 
-if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
-{
-	$Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
-}
-else
-{
-    $Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-g$($currentCommitSha.Substring(0,7))"
-}
+$Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-g$($currentCommitSha.Substring(0,7))"
 Return $Env:VersionTag

From 78592f17a92d25665120e75429ef7e223189012c Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Tue, 13 Dec 2016 00:04:42 +0100
Subject: [PATCH 35/44] Fix: version tag for pr not well formed

---
 .appveyor/gitDescribe.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor/gitDescribe.ps1 b/.appveyor/gitDescribe.ps1
index 2666c2b5..2181f00e 100644
--- a/.appveyor/gitDescribe.ps1
+++ b/.appveyor/gitDescribe.ps1
@@ -1,6 +1,6 @@
 if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
 {
-	$Env:VersionTag = "0.0.0.pr-na-PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
+	$Env:VersionTag = "0.0.0-na-PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
 	Return $Env:VersionTag
 }
 

From 02126560ca73d06eb9e27aa31be1010dc67cd824 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Tue, 13 Dec 2016 19:03:39 +0100
Subject: [PATCH 36/44] -Mod: Show (short) version tag in release versions
 -Mod: Show long version tag in builds based on a release (to separate them
 from real releases)

---
 Vocaluxe/Base/CSettings.cs      | 5 +++--
 Vocaluxe/Screens/CScreenMain.cs | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs
index 94f38509..05c52e2c 100644
--- a/Vocaluxe/Base/CSettings.cs
+++ b/Vocaluxe/Base/CSettings.cs
@@ -220,9 +220,10 @@ namespace Vocaluxe.Base
         {
             string version = _Version + " (" + _Arch + ")";
 
-            if (VersionRevision != ERevision.Release)
+            string gitversion = Application.ProductVersion;
+
+            if (VersionRevision != ERevision.Release || gitversion.Split('-')[1] != "0")
             {
-                string gitversion = Application.ProductVersion;
                 version += " " + _GetVersionStatus() + String.Format(" ({0})", gitversion);
             }
 
diff --git a/Vocaluxe/Screens/CScreenMain.cs b/Vocaluxe/Screens/CScreenMain.cs
index f45915da..a884c016 100644
--- a/Vocaluxe/Screens/CScreenMain.cs
+++ b/Vocaluxe/Screens/CScreenMain.cs
@@ -54,9 +54,7 @@ namespace Vocaluxe.Screens
             base.LoadTheme(xmlPath);
 
             _Texts[_TextRelease].Text = CSettings.GetFullVersionText();
-            // ReSharper disable ConditionIsAlwaysTrueOrFalse
-            _Texts[_TextRelease].Visible = CSettings.VersionRevision != ERevision.Release;
-            // ReSharper restore ConditionIsAlwaysTrueOrFalse
+            _Texts[_TextRelease].Visible = true;
             _Statics[_StaticWarningProfiles].Visible = false;
             _Texts[_TextWarningProfiles].Visible = false;
         }

From 9699aaf00c391488a19afd60883ff9998ae743c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@gmail.com>
Date: Tue, 20 Dec 2016 14:26:13 +0100
Subject: [PATCH 37/44] Language update

---
 Output/Languages/Asturian.xml                 |  55 -----
 Output/Languages/Czech.xml                    |  39 ++--
 Output/Languages/Dutch.xml                    |  11 +-
 Output/Languages/English.xml                  |   6 +-
 Output/Languages/French.xml                   |  10 +-
 Output/Languages/German.xml                   |  70 ++++---
 Output/Languages/Hungarian.xml                | 122 ++++++-----
 Output/Languages/Italian.xml                  |  19 +-
 Output/Languages/Portuguese.xml               |  36 ++--
 Output/Languages/Spanish.xml                  |  47 ++---
 Output/Languages/Swedish.xml                  | 190 +++++++++---------
 Output/Languages/Turkish.xml                  |  11 +-
 .../Challenge/Languages/Asturian.xml          |   2 +-
 .../ChallengeMedley/Languages/Asturian.xml    |   2 +-
 .../TicTacToe/Languages/Asturian.xml          |   4 +-
 .../PartyModes/TicTacToe/Languages/French.xml |   8 +-
 .../TicTacToe/Languages/Italian.xml           |   2 +-
 Vocaluxe/Website/locales/Hungarian.json       |  86 ++++++++
 18 files changed, 402 insertions(+), 318 deletions(-)
 delete mode 100644 Output/Languages/Asturian.xml
 create mode 100644 Vocaluxe/Website/locales/Hungarian.json

diff --git a/Output/Languages/Asturian.xml b/Output/Languages/Asturian.xml
deleted file mode 100644
index fb85669c..00000000
--- a/Output/Languages/Asturian.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="language">Asturianu</string>
-  <string name="TR_PROGRAM_NAME">Vocaluxe</string>
-  <string name="TR_GENERAL_AND">y</string>
-  <string name="TR_BUTTON_EXIT">Colar</string>
-  <string name="TR_BUTTON_SAVE">Atroxar</string>
-  <string name="TR_BUTTON_BACK">Tornar</string>
-  <string name="TR_BUTTON_START">Entamar</string>
-  <string name="TR_DEBUG_TEXTURES">Testures</string>
-  <string name="TR_DEBUG_MAX_VOLUME">Volume máximu</string>
-  <string name="TR_DEBUG_SONGS">Sones cargaes</string>
-  <string name="TR_DEBUG_MOUSE">Mur</string>
-  <string name="TR_GAMEMODE_NORMAL">Normal</string>
-  <string name="TR_GAMEMODE_DUET">Duetu</string>
-  <string name="TR_GAMEMODE_SHORTSONG">Versión curtia</string>
-  <string name="TR_RATING_SUPERSTAR">Super estrella</string>
-  <string name="TR_RATING_LEAD_SINGER">Cantante llider</string>
-  <string name="TR_RATING_RISING_STAR">Estrella n\'ascensu</string>
-  <string name="TR_RATING_HOPEFUL">Esperanzáu</string>
-  <string name="TR_RATING_AMATEUR">Amateur</string>
-  <string name="TR_CONFIG_SOFTWARE">Software</string>
-  <string name="TR_CONFIG_OPENGL">OpenGL</string>
-  <string name="TR_CONFIG_TEXTURE_LOWEST">Lowest</string>
-  <string name="TR_CONFIG_TEXTURE_LOW">Baxo</string>
-  <string name="TR_CONFIG_TEXTURE_MEDIUM">Medio</string>
-  <string name="TR_CONFIG_TEXTURE_HIGH">Alto</string>
-  <string name="TR_CONFIG_TEXTURE_HIGHEST">Llo más alto</string>
-  <string name="TR_CONFIG_OFF">Apagáu</string>
-  <string name="TR_CONFIG_ON">Enceso</string>
-  <string name="TR_CONFIG_ONLY_FPS">Solo FPS</string>
-  <string name="TR_CONFIG_LEVEL1">Nivel 1</string>
-  <string name="TR_CONFIG_LEVEL2">Nivel 2</string>
-  <string name="TR_CONFIG_LEVEL3">NIvel 3</string>
-  <string name="TR_CONFIG_LEVEL_MAX">Max</string>
-  <string name="TR_CONFIG_LIST">Llista</string>
-  <string name="TR_CONFIG_COVERLOADING_ATSTART">Nel aniciu</string>
-  <string name="TR_CONFIG_RANDOM">Al debalu</string>
-  <string name="TR_CONFIG_FOLDER">Carpeta</string>
-  <string name="TR_CONFIG_ARTIST">Artista</string>
-  <string name="TR_CONFIG_ARTIST_LETTER">Lletra l\'artista</string>
-  <string name="TR_CONFIG_TITLE_LETTER">Títulu la lletra</string>
-  <string name="TR_CONFIG_EDITION">Edición</string>
-  <string name="TR_CONFIG_GENRE">Xéneru</string>
-  <string name="TR_CONFIG_YEAR">Añu</string>
-  <string name="TR_CONFIG_DECADE">Década</string>
-  <string name="TR_CONFIG_LANGUAGE">Llingua</string>
-  <string name="TR_CONFIG_EASY">Cenciello</string>
-  <string name="TR_CONFIG_NORMAL">Normal</string>
-  <string name="TR_CONFIG_HARD">Difícil</string>
-  <string name="TR_CONFIG_TIMERMODE_CURRENT">Anguaño</string>
-  <string name="TR_CONFIG_TIMERMODE_REMAINING">Faltante</string>
-  <string name="TR_CONFIG_TIMERMODE_TOTAL">Total</string>
-  <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
-</resources>
diff --git a/Output/Languages/Czech.xml b/Output/Languages/Czech.xml
index 67132acc..a34fe68f 100644
--- a/Output/Languages/Czech.xml
+++ b/Output/Languages/Czech.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="language"> čeština</string>
+  <string name="language">Čeština</string>
   <string name="TR_PROGRAM_NAME">Vocaluxe</string>
   <string name="TR_GENERAL_AND">a</string>
   <string name="TR_BUTTON_EXIT">Ukončit</string>
@@ -11,7 +11,7 @@
   <string name="TR_DEBUG_VIDEO_STREAMS">Obrazové proudy</string>
   <string name="TR_DEBUG_TEXTURES">Textury</string>
   <string name="TR_DEBUG_TONE_ABS">ToneAbs</string>
-  <string name="TR_DEBUG_MAX_VOLUME">Nevětší hlasitost</string>
+  <string name="TR_DEBUG_MAX_VOLUME">Největší hlasitost</string>
   <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>
@@ -28,7 +28,7 @@
   <string name="TR_RATING_AMATEUR">Amatér</string>
   <string name="TR_RATING_TONE_DEAF">Neumětel - nemající hudební sluch</string>
   <string name="TR_USERROLE_GUEST">Host</string>
-  <string name="TR_USERROLE_NORMAL">Obyčejný uživatel</string>
+  <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_CONFIG_SOFTWARE">Software</string>
@@ -46,6 +46,7 @@
   <string name="TR_CONFIG_LEVEL2">Úroveň 2</string>
   <string name="TR_CONFIG_LEVEL3">Úroveň 3</string>
   <string name="TR_CONFIG_LEVEL_MAX">Nejvíce</string>
+  <string name="TR_CONFIG_LIST">Seznam</string>
   <string name="TR_CONFIG_DREIDEL">Drejdl (čtyřboká kostka)</string>
   <string name="TR_CONFIG_TILE_BOARD">Herní deska</string>
   <string name="TR_CONFIG_BOOK">Kniha</string>
@@ -79,6 +80,10 @@
   <string name="TR_CONFIG_FADEPLAYERINFO_ALL">Vše</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Pouze jména a zastupující obrázky</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Nic</string>
+  <string name="TR_CONFIG_LYRICSTYLE_FILL">Vyplnit</string>
+  <string name="TR_CONFIG_LYRICSTYLE_JUMP">Skočit</string>
+  <string name="TR_CONFIG_LYRICSTYLE_SLIDE">Sklouznout</string>
+  <string name="TR_CONFIG_LYRICSTYLE_ZOOM">Zvětšení</string>
   <string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Dole</string>
   <string name="TR_CONFIG_LYRICSPOSITION_TOP">Nahoře</string>
   <string name="TR_CONFIG_LYRICSPOSITION_BOTH">Nahoře a dole</string>
@@ -107,12 +112,12 @@
   <string name="TR_SCREENPARTY_NUMPLAYERS">Počet hráčů</string>
   <string name="TR_SCREENNAMES_MENU">Výběr hráče</string>
   <string name="TR_SCREENNAMES_PLAYER">Hráč</string>
-  <string name="TR_SCREENNAMES_1PLAYER">Hráč 1</string>
-  <string name="TR_SCREENNAMES_2PLAYER">Hráč 2</string>
-  <string name="TR_SCREENNAMES_3PLAYER">Hráč 3</string>
-  <string name="TR_SCREENNAMES_4PLAYER">Hráč 4</string>
-  <string name="TR_SCREENNAMES_5PLAYER">Hráč 5</string>
-  <string name="TR_SCREENNAMES_6PLAYER">Hráč 6</string>
+  <string name="TR_SCREENNAMES_1PLAYER">1 hráč</string>
+  <string name="TR_SCREENNAMES_2PLAYER">2 hráči</string>
+  <string name="TR_SCREENNAMES_3PLAYER">3 hráči</string>
+  <string name="TR_SCREENNAMES_4PLAYER">4 hráči</string>
+  <string name="TR_SCREENNAMES_5PLAYER">5 hráčů</string>
+  <string name="TR_SCREENNAMES_6PLAYER">6 hráčů</string>
   <string name="TR_SCREENNAMES_WARNING_MICS_SG">Varování: Hráči %v není přiřazen žádný mikrofon!</string>
   <string name="TR_SCREENNAMES_WARNING_MICS_PL">Varování: Hráčům %v nejsou přiřazeny žádné mikrofony!</string>
   <string name="TR_SCREENNAMES_WARNING_PROFILES_SG">Varování: Hráči %v není přiřazen žádný profil!</string>
@@ -162,7 +167,7 @@
   <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Uložit snímek obrazovky</string>
   <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Smazat snímek obrazovky</string>
   <string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Kamera</string>
-  <string name="TR_SCREENO_OPTIONS">Nastavení nabídky</string>
+  <string name="TR_SCREENO_OPTIONS">Nastavení</string>
   <string name="TR_SCREENO_BUTTON_GAME">Hra</string>
   <string name="TR_SCREENO_BUTTON_SOUND">Zvuk</string>
   <string name="TR_SCREENO_BUTTON_RECORD">Nahrávání</string>
@@ -181,6 +186,12 @@
   <string name="TR_SCREENORECORD_OPTIONS">Nastavení nahrávání</string>
   <string name="TR_SCREENORECORD_DEVICE">Zařízení</string>
   <string name="TR_SCREENORECORD_INPUT">Vstup</string>
+  <string name="TR_SCREENORECORD_PLAYER_1">Hráč 1</string>
+  <string name="TR_SCREENORECORD_PLAYER_2">Hráč 2</string>
+  <string name="TR_SCREENORECORD_PLAYER_3">Hráč 3</string>
+  <string name="TR_SCREENORECORD_PLAYER_4">Hráč 4</string>
+  <string name="TR_SCREENORECORD_PLAYER_5">Hráč 5</string>
+  <string name="TR_SCREENORECORD_PLAYER_6">Hráč 6</string>
   <string name="TR_SCREENORECORD_MIC_DELAY">Zpoždění mikrofonu</string>
   <string name="TR_SCREENORECORD_MIC_WARNING">Varování: Alespoň jeden hráčům je přiřazen ke dvěma mikrofonům.</string>
   <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Zkouška zpoždění</string>
@@ -196,11 +207,11 @@
   <string name="TR_SCREENOTHEME_COVERTHEME">Téma obalu</string>
   <string name="TR_SCREENOTHEME_NOTELINES">Ukázat notové linky</string>
   <string name="TR_SCREENOTHEME_TONEHELPER">Ukázat pomocníka s tónem</string>
-  <string name="TR_SCREENOTHEME_TIMERLOOK">Vzhled časomíry</string>
-  <string name="TR_SCREENOTHEME_FADEINFO">Zesílit/Zeslabit informace přehrávače</string>
+  <string name="TR_SCREENOTHEME_TIMERLOOK">Režim časomíry</string>
+  <string name="TR_SCREENOTHEME_FADEINFO">Prolínat informace přehrávače</string>
   <string name="TR_SCREENOTHEME_COVERLOADING">Chování nahrávání obalu</string>
   <string name="TR_SCREENOLYRICS_OPTIONS">Nastavení textu písně</string>
-  <string name="TR_SCREENOLYRICS_STYLE">Styl</string>
+  <string name="TR_SCREENOLYRICS_STYLE">Styl animace</string>
   <string name="TR_SCREENOLYRICS_POSITION">Poloha textu písně</string>
   <string name="TR_SCREENOVIDEO_OPTIONS">Nastavení obrazu</string>
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Pozadí obrazu</string>
@@ -210,7 +221,7 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Kamery</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Rozlišení kamery</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Přizpůsobení obrazovky</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Stiskněte Ctrl + Alt (+ Shift) + šipky|\"+\" pro upravení obrazovky</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Stiskněte Ctrl + Alt (+ Shift) + šipky pro upravení obrazovky</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">Ctrl + Alt + 0 pro vrácení úprav zpět na výchozí hodnoty</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Nahoře vlevo</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Nahoře vpravo</string>
diff --git a/Output/Languages/Dutch.xml b/Output/Languages/Dutch.xml
index a83aa554..e6b70d3b 100644
--- a/Output/Languages/Dutch.xml
+++ b/Output/Languages/Dutch.xml
@@ -46,6 +46,7 @@
   <string name="TR_CONFIG_LEVEL2">Niveau 2</string>
   <string name="TR_CONFIG_LEVEL3">Niveau 3</string>
   <string name="TR_CONFIG_LEVEL_MAX">Max</string>
+  <string name="TR_CONFIG_LIST">Liste</string>
   <string name="TR_CONFIG_DREIDEL">Dreidel</string>
   <string name="TR_CONFIG_TILE_BOARD">Tegels</string>
   <string name="TR_CONFIG_BOOK">Boek</string>
@@ -173,7 +174,7 @@
   <string name="TR_SCREENOGAME_OPTIONS">Spelinstellingen</string>
   <string name="TR_SCREENOGAME_LANGUAGE">Taal</string>
   <string name="TR_SCREENOGAME_DEBUGLEVEL">Debug Niveau</string>
-  <string name="TR_SCREENOGAME_SONGMENU">Liedjesmenu</string>
+  <string name="TR_SCREENOGAME_SONGMENU">Liedjesmenu&lt;</string>
   <string name="TR_SCREENOGAME_SONGSORTING">Sorteren Liedjes</string>
   <string name="TR_SCREENOGAME_TABS">Tabs</string>
   <string name="TR_SCREENOGAME_DIFFICULTY">Moeilijkheidsgraad</string>
@@ -181,6 +182,12 @@
   <string name="TR_SCREENORECORD_OPTIONS">Opname-opties</string>
   <string name="TR_SCREENORECORD_DEVICE">Apparaat</string>
   <string name="TR_SCREENORECORD_INPUT">Input</string>
+  <string name="TR_SCREENORECORD_PLAYER_1">Speler 1</string>
+  <string name="TR_SCREENORECORD_PLAYER_2">Speler 2</string>
+  <string name="TR_SCREENORECORD_PLAYER_3">Speler 3</string>
+  <string name="TR_SCREENORECORD_PLAYER_4">Speler 4</string>
+  <string name="TR_SCREENORECORD_PLAYER_5">Speler 5</string>
+  <string name="TR_SCREENORECORD_PLAYER_6">Speler 6</string>
   <string name="TR_SCREENORECORD_MIC_DELAY">Microfoonvertraging</string>
   <string name="TR_SCREENORECORD_MIC_WARNING">Waarschuwing: Ten minste één speler is toegewezen aan twee microfoons.</string>
   <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Vertragingstest</string>
@@ -210,7 +217,7 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcams</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webcam resolutie</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Beeldscherm aanpassingen</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Druk Ctrl+ Alt (+ Shift) + pijltjestoetsen|\"+\" om het scherm aan te passen.</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Druk Ctrl+ Alt (+ Shift) + pijltjestoetsen|"+" om het scherm aan te passen.</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">Ctrl + Alt + 0 om te herstellen</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Top links</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Top rechts</string>
diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml
index f5fc89bc..80fdf299 100644
--- a/Output/Languages/English.xml
+++ b/Output/Languages/English.xml
@@ -73,6 +73,8 @@
   <string name="TR_CONFIG_TIMERMODE_TOTAL">Total</string>
   <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
   <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Expanded</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_ALL">List all</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_BEST">List best</string>
   <string name="TR_CONFIG_OWN_MUSIC">Own music and background-music</string>
   <string name="TR_CONFIG_NO_OWN_MUSIC">No own music</string>
   <string name="TR_CONFIG_ONLY_OWN_MUSIC">Only own music</string>
@@ -103,7 +105,7 @@
   <string name="TR_SCREENPARTY_DESCRIPTION">Description</string>
   <string name="TR_SCREENPARTY_AUTHOR">Author</string>
   <string name="TR_SCREENPARTY_VERSION">Version</string>
-  <string name="TR_SCREENPARTY_ERROR">Can\'t load this party-mode.</string>
+  <string name="TR_SCREENPARTY_ERROR">Can't load this party-mode.</string>
   <string name="TR_SCREENPARTY_ERROR_MICS">There are no mics configured!</string>
   <string name="TR_SCREENPARTY_ERROR_MIC_NUM">%d mics are required for this party-mode!</string>
   <string name="TR_SCREENPARTY_TARGETAUDIENCE">Target audience</string>
@@ -183,6 +185,7 @@
   <string name="TR_SCREENOGAME_TABS">Tabs</string>
   <string name="TR_SCREENOGAME_DIFFICULTY">Game difficulty</string>
   <string name="TR_SCREENOGAME_TIMERMODE">Timer mode</string>
+  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Highscore style</string>
   <string name="TR_SCREENORECORD_OPTIONS">Record Options</string>
   <string name="TR_SCREENORECORD_DEVICE">Device</string>
   <string name="TR_SCREENORECORD_INPUT">Input</string>
@@ -201,6 +204,7 @@
   <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Background-music source</string>
   <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Preview-music volume</string>
   <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Game-music volume</string>
+  <string name="TR_SCREENOSOUND_KARAOKEEFFECT">Karaoke effect</string>
   <string name="TR_SCREENOTHEME_OPTIONS">Theme Options</string>
   <string name="TR_SCREENOTHEME_THEME">Theme</string>
   <string name="TR_SCREENOTHEME_SKIN">Skin</string>
diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml
index 371b3e07..fe0c7149 100644
--- a/Output/Languages/French.xml
+++ b/Output/Languages/French.xml
@@ -56,7 +56,7 @@
   <string name="TR_CONFIG_RANDOM">Aléatoire</string>
   <string name="TR_CONFIG_FOLDER">Dossier</string>
   <string name="TR_CONFIG_ARTIST">Artiste</string>
-  <string name="TR_CONFIG_ARTIST_LETTER">Initiale d'Artiste</string>
+  <string name="TR_CONFIG_ARTIST_LETTER">Initiale d'Artist</string>
   <string name="TR_CONFIG_TITLE_LETTER">Initiale de Titre</string>
   <string name="TR_CONFIG_EDITION">Edition</string>
   <string name="TR_CONFIG_GENRE">Genre</string>
@@ -181,6 +181,12 @@
   <string name="TR_SCREENORECORD_OPTIONS">Options d'Enregistrement</string>
   <string name="TR_SCREENORECORD_DEVICE">Appareil</string>
   <string name="TR_SCREENORECORD_INPUT">Entrée</string>
+  <string name="TR_SCREENORECORD_PLAYER_1">Joueur 1</string>
+  <string name="TR_SCREENORECORD_PLAYER_2">Joueur 2</string>
+  <string name="TR_SCREENORECORD_PLAYER_3">Joueur 3</string>
+  <string name="TR_SCREENORECORD_PLAYER_4">Joueur 4</string>
+  <string name="TR_SCREENORECORD_PLAYER_5">Joueur 5</string>
+  <string name="TR_SCREENORECORD_PLAYER_6">Joueur 6</string>
   <string name="TR_SCREENORECORD_MIC_DELAY">Retard du Micro</string>
   <string name="TR_SCREENORECORD_MIC_WARNING">Attention: Au moins un des joueurs est assigné à 2 micros.</string>
   <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Test du Retard</string>
@@ -209,7 +215,7 @@
   <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Afficher la vidéo de la musique de fond</string>
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcams</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Résolution de la Webcam</string>
-  <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Ajustements de l'écran</string>
+  <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Ajustements de l'écra</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Appuyer sur CTRL + ALT (+ Maj) + Flèches|"+" pour ajuster l'écran</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTRL + ALT + 0 pour annuler</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Haut gauche</string>
diff --git a/Output/Languages/German.xml b/Output/Languages/German.xml
index a076eb67..1de7ea61 100644
--- a/Output/Languages/German.xml
+++ b/Output/Languages/German.xml
@@ -11,7 +11,7 @@
   <string name="TR_DEBUG_VIDEO_STREAMS">Video-Streams</string>
   <string name="TR_DEBUG_TEXTURES">Textures</string>
   <string name="TR_DEBUG_TONE_ABS">ToneAbs</string>
-  <string name="TR_DEBUG_MAX_VOLUME">Max. Volume</string>
+  <string name="TR_DEBUG_MAX_VOLUME">Max Lautstärke</string>
   <string name="TR_DEBUG_SONGS">Geladene Songs</string>
   <string name="TR_DEBUG_MOUSE">Maus</string>
   <string name="TR_DEBUG_MEMORY">Speicherverbrauch</string>
@@ -30,7 +30,7 @@
   <string name="TR_USERROLE_GUEST">Gast</string>
   <string name="TR_USERROLE_NORMAL">Normaler Benutzer</string>
   <string name="TR_USERROLE_ADMIN">Administrator</string>
-  <string name="TR_USERROLE_KEYBOARDUSER">Tastatur</string>
+  <string name="TR_USERROLE_KEYBOARDUSER">Tastatur Benutzer</string>
   <string name="TR_CONFIG_SOFTWARE">Software</string>
   <string name="TR_CONFIG_OPENGL">OpenGL</string>
   <string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -46,19 +46,19 @@
   <string name="TR_CONFIG_LEVEL2">Level 2</string>
   <string name="TR_CONFIG_LEVEL3">Level 3</string>
   <string name="TR_CONFIG_LEVEL_MAX">Maximal</string>
-  <string name="TR_CONFIG_LIST">Song-Liste</string>
+  <string name="TR_CONFIG_LIST">Liste</string>
   <string name="TR_CONFIG_DREIDEL">Dreidel</string>
-  <string name="TR_CONFIG_TILE_BOARD">TileBoard</string>
+  <string name="TR_CONFIG_TILE_BOARD">Kacheln</string>
   <string name="TR_CONFIG_BOOK">Book</string>
-  <string name="TR_CONFIG_COVERLOADING_ONDEMAND">Bei Bedarf</string>
-  <string name="TR_CONFIG_COVERLOADING_ATSTART">Bei Programmstart</string>
+  <string name="TR_CONFIG_COVERLOADING_ONDEMAND">Auf Abruf</string>
+  <string name="TR_CONFIG_COVERLOADING_ATSTART">Beim Start</string>
   <string name="TR_CONFIG_COVERLOADING_DYNAMIC">Dynamisch</string>
   <string name="TR_CONFIG_NONE">Keine</string>
   <string name="TR_CONFIG_RANDOM">Zufällig</string>
   <string name="TR_CONFIG_FOLDER">Ordner</string>
   <string name="TR_CONFIG_ARTIST">Artist</string>
-  <string name="TR_CONFIG_ARTIST_LETTER">Artist Buchstabe</string>
-  <string name="TR_CONFIG_TITLE_LETTER">Titel Buchstabe</string>
+  <string name="TR_CONFIG_ARTIST_LETTER">Artist-Buchstabe</string>
+  <string name="TR_CONFIG_TITLE_LETTER">Titel-Buchstabe</string>
   <string name="TR_CONFIG_EDITION">Edition</string>
   <string name="TR_CONFIG_GENRE">Genre</string>
   <string name="TR_CONFIG_YEAR">Jahr</string>
@@ -73,6 +73,8 @@
   <string name="TR_CONFIG_TIMERMODE_TOTAL">Gesamt</string>
   <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
   <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Erweitert</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_ALL">Alle auflisten</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_BEST">Bester Spieler-Score</string>
   <string name="TR_CONFIG_OWN_MUSIC">Eigene Musik und Hintergrundmusik</string>
   <string name="TR_CONFIG_NO_OWN_MUSIC">Keine eigene Musik</string>
   <string name="TR_CONFIG_ONLY_OWN_MUSIC">Nur eigene Musik</string>
@@ -80,6 +82,10 @@
   <string name="TR_CONFIG_FADEPLAYERINFO_ALL">Alle</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Nur Namen und Avatar</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Keine</string>
+  <string name="TR_CONFIG_LYRICSTYLE_FILL">Füllen</string>
+  <string name="TR_CONFIG_LYRICSTYLE_JUMP">Springen</string>
+  <string name="TR_CONFIG_LYRICSTYLE_SLIDE">Schieben</string>
+  <string name="TR_CONFIG_LYRICSTYLE_ZOOM">Zoom</string>
   <string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Unten</string>
   <string name="TR_CONFIG_LYRICSPOSITION_TOP">Oben</string>
   <string name="TR_CONFIG_LYRICSPOSITION_BOTH">Oben und Unten</string>
@@ -133,7 +139,7 @@
   <string name="TR_SCREENSONG_NEWPLAYLIST">Neue Playlist</string>
   <string name="TR_SCREENSONG_SONGOPTIONS">Lied-Optionen</string>
   <string name="TR_SCREENSONG_SEARCH">Suche:</string>
-  <string name="TR_SCREENSONG_NOLANGUAGE">Ohne Sprache</string>
+  <string name="TR_SCREENSONG_NOLANGUAGE">Keine Sprache</string>
   <string name="TR_SCREENSONG_NOYEAR">Ohne Jahr</string>
   <string name="TR_SCREENSONG_NOGENRE">Ohne Genre</string>
   <string name="TR_SCREENSONG_NOEDITION">Ohne Edition</string>
@@ -152,16 +158,16 @@
   <string name="TR_SCREENSCORE_OVERALLSCORE">Gesamtpunktzahl</string>
   <string name="TR_SCREENHIGHSCORE_HIGHSCORE">Highscore</string>
   <string name="TR_SCREENPROFILES_PROFILES">Profile</string>
-  <string name="TR_SCREENPROFILES_PLAYERNAME">Spieler-Name</string>
+  <string name="TR_SCREENPROFILES_PLAYERNAME">Spielername</string>
   <string name="TR_SCREENPROFILES_GAMEDIFFICULTY">Schwierigkeit</string>
   <string name="TR_SCREENPROFILES_AVATAR">Avatar</string>
   <string name="TR_SCREENPROFILES_USERROLE">Benutzerrolle</string>
   <string name="TR_SCREENPROFILES_ACTIVE">Aktiv</string>
   <string name="TR_SCREENPROFILES_BUTTON_NEW">Neu</string>
   <string name="TR_SCREENPROFILES_BUTTON_DELETE">Löschen</string>
-  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Snapshot</string>
-  <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Snapshot speichern</string>
-  <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Snapshot löschen</string>
+  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Schnappschuss aufnehmen</string>
+  <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Schnappschuss speichern</string>
+  <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Schnappschuss löschen</string>
   <string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Webcam</string>
   <string name="TR_SCREENO_OPTIONS">Einstellungen</string>
   <string name="TR_SCREENO_BUTTON_GAME">Spiel</string>
@@ -174,11 +180,12 @@
   <string name="TR_SCREENOGAME_OPTIONS">Spieleinstellungen</string>
   <string name="TR_SCREENOGAME_LANGUAGE">Sprache</string>
   <string name="TR_SCREENOGAME_DEBUGLEVEL">Debug-Level</string>
-  <string name="TR_SCREENOGAME_SONGMENU">Song-Menü</string>
-  <string name="TR_SCREENOGAME_SONGSORTING">Song-Sortierung</string>
+  <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_DIFFICULTY">Schwierigkeit</string>
-  <string name="TR_SCREENOGAME_TIMERMODE">Timer-Modus</string>
+  <string name="TR_SCREENOGAME_TIMERMODE">Zeit-Modus</string>
+  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Highscore-Stil</string>
   <string name="TR_SCREENORECORD_OPTIONS">Aufnahmeeinstellungen</string>
   <string name="TR_SCREENORECORD_DEVICE">Soundkarte</string>
   <string name="TR_SCREENORECORD_INPUT">Eingang</string>
@@ -188,37 +195,38 @@
   <string name="TR_SCREENORECORD_PLAYER_4">Spieler 4</string>
   <string name="TR_SCREENORECORD_PLAYER_5">Spieler 5</string>
   <string name="TR_SCREENORECORD_PLAYER_6">Spieler 6</string>
-  <string name="TR_SCREENORECORD_MIC_DELAY">Mikrofon-Verzögerung</string>
+  <string name="TR_SCREENORECORD_MIC_DELAY">Mikrofonverzögerung</string>
   <string name="TR_SCREENORECORD_MIC_WARNING">Warnung: Momentan sind einem Spieler zwei Mikrofone zugeordnet!</string>
   <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Verzögerungs-Test</string>
-  <string name="TR_SCREENOSOUND_OPTIONS">Soundeinstellungen</string>
+  <string name="TR_SCREENOSOUND_OPTIONS">Sound Einstellungen</string>
   <string name="TR_SCREENOSOUND_BACKGROUNDMUSIC">Hintergrundmusik</string>
-  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Hintergrundmusiklautstärke</string>
-  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Hintergrundmusikquelle</string>
-  <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Vorschaulautstärke</string>
-  <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Spiellautstärke</string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Lautstärke der Hintergrundmusik</string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Quelle der Hintergrundmusik</string>
+  <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Lautstärke der Vorschau</string>
+  <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Lautstärke des Spiels</string>
+  <string name="TR_SCREENOSOUND_KARAOKEEFFECT">Karaoke Effekt</string>
   <string name="TR_SCREENOTHEME_OPTIONS">Designeinstellungen</string>
   <string name="TR_SCREENOTHEME_THEME">Design</string>
   <string name="TR_SCREENOTHEME_SKIN">Skin</string>
   <string name="TR_SCREENOTHEME_COVERTHEME">Cover-Theme</string>
-  <string name="TR_SCREENOTHEME_NOTELINES">Noten-Linien anzeigen</string>
+  <string name="TR_SCREENOTHEME_NOTELINES">Notenlinien anzeigen</string>
   <string name="TR_SCREENOTHEME_TONEHELPER">Ton-Helfer anzeigen</string>
-  <string name="TR_SCREENOTHEME_TIMERLOOK">Aussehen des Timers</string>
-  <string name="TR_SCREENOTHEME_FADEINFO">Spieler-Infos ein/ausblenden</string>
-  <string name="TR_SCREENOTHEME_COVERLOADING">Cover Ladeverhalten</string>
+  <string name="TR_SCREENOTHEME_TIMERLOOK">Zeitleisten-Modus</string>
+  <string name="TR_SCREENOTHEME_FADEINFO">Spieler-Informationen einblenden</string>
+  <string name="TR_SCREENOTHEME_COVERLOADING">Verhalten beim Laden der Cover</string>
   <string name="TR_SCREENOLYRICS_OPTIONS">Songtexteinstellungen</string>
-  <string name="TR_SCREENOLYRICS_STYLE">Stil</string>
+  <string name="TR_SCREENOLYRICS_STYLE">Lyrics-Animation</string>
   <string name="TR_SCREENOLYRICS_POSITION">Lyrics Position</string>
   <string name="TR_SCREENOVIDEO_OPTIONS">Videoeinstellungen</string>
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Video-Hintergründe</string>
   <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Video-Vorschau</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Videos während des Singens</string>
-  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Zeige Video zur Hintergrundmusik</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Aktuelles Hintergrundvideo anzeigen</string>
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcams</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webcam-Auflösung</string>
-  <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Anzeigeanpassungen</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">STRG + ALT (+ SHIFT) + Pfeiltasten oder "+" drücken um den Bildschirm zu justieren.</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">STRG + ALT + 0 um die Änderungen zurückzusetzen.</string>
+  <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Bildschirm anpassen</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">STRG + ALT (+ UMSCHALT) + Pfeile drücken, um Bildschirm anzupassen</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">STRG + ALT + 0 um Einstellungen zurückzusetzen</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Oben links</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Oben rechts</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Unten links</string>
diff --git a/Output/Languages/Hungarian.xml b/Output/Languages/Hungarian.xml
index 4b53a152..e15833b7 100644
--- a/Output/Languages/Hungarian.xml
+++ b/Output/Languages/Hungarian.xml
@@ -11,7 +11,7 @@
   <string name="TR_DEBUG_VIDEO_STREAMS">Video streams</string>
   <string name="TR_DEBUG_TEXTURES">Textúrák</string>
   <string name="TR_DEBUG_TONE_ABS">ToneAbs</string>
-  <string name="TR_DEBUG_MAX_VOLUME">Max Hangerő</string>
+  <string name="TR_DEBUG_MAX_VOLUME">Max hangerő</string>
   <string name="TR_DEBUG_SONGS">Betöltött dalok</string>
   <string name="TR_DEBUG_MOUSE">Egér</string>
   <string name="TR_DEBUG_MEMORY">Memóriahasználat</string>
@@ -30,6 +30,7 @@
   <string name="TR_USERROLE_GUEST">Vendég</string>
   <string name="TR_USERROLE_NORMAL">Normál felhasználó</string>
   <string name="TR_USERROLE_ADMIN">Adminisztrátor</string>
+  <string name="TR_USERROLE_KEYBOARDUSER">Billentyűzetkezelő</string>
   <string name="TR_CONFIG_SOFTWARE">Szoftveres</string>
   <string name="TR_CONFIG_OPENGL">OpenGL</string>
   <string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -45,18 +46,19 @@
   <string name="TR_CONFIG_LEVEL2">2. Szint</string>
   <string name="TR_CONFIG_LEVEL3">3. Szint</string>
   <string name="TR_CONFIG_LEVEL_MAX">Max</string>
+  <string name="TR_CONFIG_LIST">Lista</string>
   <string name="TR_CONFIG_DREIDEL">Körhinta</string>
-  <string name="TR_CONFIG_TILE_BOARD">Csempe</string>
+  <string name="TR_CONFIG_TILE_BOARD">Csempék</string>
   <string name="TR_CONFIG_BOOK">Könyv</string>
-  <string name="TR_CONFIG_COVERLOADING_ONDEMAND">Amikor Szükséges</string>
-  <string name="TR_CONFIG_COVERLOADING_ATSTART">Indulásnál</string>
+  <string name="TR_CONFIG_COVERLOADING_ONDEMAND">Dinamikusan</string>
+  <string name="TR_CONFIG_COVERLOADING_ATSTART">Indításnál</string>
   <string name="TR_CONFIG_COVERLOADING_DYNAMIC">Dinamikusan</string>
   <string name="TR_CONFIG_NONE">Nincs</string>
   <string name="TR_CONFIG_RANDOM">Véletlenszerű</string>
   <string name="TR_CONFIG_FOLDER">Könyvtár</string>
   <string name="TR_CONFIG_ARTIST">Előadó</string>
-  <string name="TR_CONFIG_ARTIST_LETTER">Előadó Betűrendben </string>
-  <string name="TR_CONFIG_TITLE_LETTER">Cím Betűrendben</string>
+  <string name="TR_CONFIG_ARTIST_LETTER">Előadó betűrend szerint</string>
+  <string name="TR_CONFIG_TITLE_LETTER">Cím betűrend szerint</string>
   <string name="TR_CONFIG_EDITION">Kiadás</string>
   <string name="TR_CONFIG_GENRE">Műfaj</string>
   <string name="TR_CONFIG_YEAR">Év</string>
@@ -71,13 +73,17 @@
   <string name="TR_CONFIG_TIMERMODE_TOTAL">Összes</string>
   <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normál</string>
   <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Kibővített</string>
-  <string name="TR_CONFIG_OWN_MUSIC">Saját és Háttérzene</string>
-  <string name="TR_CONFIG_NO_OWN_MUSIC">Nincs Saját Zene</string>
-  <string name="TR_CONFIG_ONLY_OWN_MUSIC">Csak Saját zene</string>
+  <string name="TR_CONFIG_OWN_MUSIC">Saját- és háttérzene</string>
+  <string name="TR_CONFIG_NO_OWN_MUSIC">Saját zenét ne</string>
+  <string name="TR_CONFIG_ONLY_OWN_MUSIC">Csak saját zenét</string>
   <string name="TR_CONFIG_ONLY_SONG">Csak a kiválasztott dal</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_ALL">Mindent</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Csak Nevek és Profilképek</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Semmit</string>
+  <string name="TR_CONFIG_LYRICSTYLE_FILL">Kiszínezés</string>
+  <string name="TR_CONFIG_LYRICSTYLE_JUMP">Ugrás</string>
+  <string name="TR_CONFIG_LYRICSTYLE_SLIDE">Csúsztatás</string>
+  <string name="TR_CONFIG_LYRICSTYLE_ZOOM">Nagyítás</string>
   <string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Alul</string>
   <string name="TR_CONFIG_LYRICSPOSITION_TOP">Felül</string>
   <string name="TR_CONFIG_LYRICSPOSITION_BOTH">Felül és alul</string>
@@ -88,55 +94,56 @@
   <string name="TR_SCREENLOAD_LOADED">betöltve</string>
   <string name="TR_SCREENMAIN_MENU">Főmenü</string>
   <string name="TR_SCREENMAIN_BUTTON_SING">Éneklés</string>
-  <string name="TR_SCREENMAIN_BUTTON_PARTY">Buli</string>
+  <string name="TR_SCREENMAIN_BUTTON_PARTY">Parti</string>
   <string name="TR_SCREENMAIN_BUTTON_OPTIONS">Beállítások</string>
   <string name="TR_SCREENMAIN_BUTTON_PROFILES">Profilok</string>
   <string name="TR_SCREENMAIN_TEXT_NOPROFILES">Nincsenek profilok! </string>
-  <string name="TR_SCREENPARTY_TITLE">Parti Mód Választás</string>
+  <string name="TR_SCREENPARTY_TITLE">Parti mód választás</string>
   <string name="TR_SCREENPARTY_MODES">Parti Mód</string>
   <string name="TR_SCREENPARTY_DESCRIPTION">Leírás</string>
   <string name="TR_SCREENPARTY_AUTHOR">Készítő</string>
   <string name="TR_SCREENPARTY_VERSION">Verzió</string>
   <string name="TR_SCREENPARTY_ERROR">Nem Betölthető Parti Mód.</string>
   <string name="TR_SCREENPARTY_ERROR_MICS">Nincs mikrofon beállítva! </string>
+  <string name="TR_SCREENPARTY_ERROR_MIC_NUM">%d mikrofon szükséges ehhez a parti-módhoz</string>
   <string name="TR_SCREENPARTY_TARGETAUDIENCE">Célközönség</string>
   <string name="TR_SCREENPARTY_NOTEAMS">Csapatok Nélkül</string>
   <string name="TR_SCREENPARTY_NUMTEAMS">Csapatok Száma</string>
   <string name="TR_SCREENPARTY_NUMPLAYERS">Játékosok Száma</string>
   <string name="TR_SCREENNAMES_MENU">Játékos Választás</string>
   <string name="TR_SCREENNAMES_PLAYER">Játékos</string>
-  <string name="TR_SCREENNAMES_1PLAYER">Játékos 1</string>
-  <string name="TR_SCREENNAMES_2PLAYER">Játékos 2</string>
-  <string name="TR_SCREENNAMES_3PLAYER">Játékos 3</string>
-  <string name="TR_SCREENNAMES_4PLAYER">Játékos 4</string>
-  <string name="TR_SCREENNAMES_5PLAYER">Játékos 5</string>
-  <string name="TR_SCREENNAMES_6PLAYER">Játékos 6</string>
+  <string name="TR_SCREENNAMES_1PLAYER">1 játékos</string>
+  <string name="TR_SCREENNAMES_2PLAYER">2 játékos</string>
+  <string name="TR_SCREENNAMES_3PLAYER">3 játékos</string>
+  <string name="TR_SCREENNAMES_4PLAYER">4 játékos</string>
+  <string name="TR_SCREENNAMES_5PLAYER">5 játékos</string>
+  <string name="TR_SCREENNAMES_6PLAYER">6 játékos</string>
   <string name="TR_SCREENNAMES_WARNING_MICS_SG">Figyelem: Nincs mikrofon csatlakoztatva a következő játékoshoz %v!</string>
   <string name="TR_SCREENNAMES_WARNING_MICS_PL">Figyelem: Nincsenek mikrofonok csatlakoztatva a következő játékosokhoz %v!</string>
   <string name="TR_SCREENNAMES_WARNING_PROFILES_SG">Figyelem: Nincs profil hozzárendelve a következő játékoshoz %v!</string>
   <string name="TR_SCREENNAMES_WARNING_PROFILES_PL">Figyelem: Nincsenek profilok hozzárendelve a következő játékosokhoz %v!</string>
   <string name="TR_SCREENSONG_MENU">Dalválasztás</string>
   <string name="TR_SCREENSONG_BUTTON_SING">Éneklés</string>
-  <string name="TR_SCREENSONG_BUTTON_PLAYLIST">Listához Hozzáadás</string>
+  <string name="TR_SCREENSONG_BUTTON_PLAYLIST">Hozzáadás a lejátszási listához</string>
   <string name="TR_SCREENSONG_BUTTON_CANCEL">Bezárás</string>
   <string name="TR_SCREENSONG_BUTTON_RANDOM">Véletlenszerű Dal Kiválasztása</string>
   <string name="TR_SCREENSONG_BUTTON_RANDOMCAT">Véletlenszerű Kategória Kiválasztása </string>
-  <string name="TR_SCREENSONG_BUTTON_SINGALL">Összes Dal Éneklése</string>
+  <string name="TR_SCREENSONG_BUTTON_SINGALL">Minden dal éneklése</string>
   <string name="TR_SCREENSONG_BUTTON_SINGALLVISIBLE">Itt látható Dalok Éneklése</string>
-  <string name="TR_SCREENSONG_BUTTON_OPENPLAYLIST">Lista Megnyitása</string>
+  <string name="TR_SCREENSONG_BUTTON_OPENPLAYLIST">Lejátszási lista megnyitása</string>
   <string name="TR_SCREENSONG_BUTTON_OPEN_SELECTED_ITEM">Kiválaszt</string>
   <string name="TR_SCREENSONG_BUTTON_RANDOMMEDLEY">Véletlenszerű Dalrészlet Éneklése</string>
   <string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Dalrészletek Éneklése</string>
-  <string name="TR_SCREENSONG_NEWPLAYLIST">Új Lista</string>
+  <string name="TR_SCREENSONG_NEWPLAYLIST">Új lejátszási lista</string>
   <string name="TR_SCREENSONG_SONGOPTIONS">Dalbeállítások</string>
   <string name="TR_SCREENSONG_SEARCH">Keresés:</string>
-  <string name="TR_SCREENSONG_NOLANGUAGE">Nincs Nyelv</string>
+  <string name="TR_SCREENSONG_NOLANGUAGE">Nincs nyelv</string>
   <string name="TR_SCREENSONG_NOYEAR">Nincs Év</string>
   <string name="TR_SCREENSONG_NOGENRE">Nincs Műfaj</string>
   <string name="TR_SCREENSONG_NOEDITION">Nincs Kiadás</string>
   <string name="TR_SCREENSONG_ALLSONGS">Minden Dal</string>
-  <string name="TR_SCREENSONG_NUMSONGS">(%v Dal)</string>
-  <string name="TR_SCREENSONG_NUMSONG">(%v Dal)</string>
+  <string name="TR_SCREENSONG_NUMSONGS">(%v dal)</string>
+  <string name="TR_SCREENSONG_NUMSONG">(%v dal)</string>
   <string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
   <string name="TR_SCREENSING_PAUSE">Szünet</string>
   <string name="TR_SCREENSING_BUTTON_CANCEL">Befejezés</string>
@@ -149,18 +156,18 @@
   <string name="TR_SCREENSCORE_OVERALLSCORE">Összpontszám</string>
   <string name="TR_SCREENHIGHSCORE_HIGHSCORE">Eredménylista</string>
   <string name="TR_SCREENPROFILES_PROFILES">Profilok</string>
-  <string name="TR_SCREENPROFILES_PLAYERNAME">Játékos Neve</string>
-  <string name="TR_SCREENPROFILES_GAMEDIFFICULTY">Nehézségi Szint</string>
+  <string name="TR_SCREENPROFILES_PLAYERNAME">Játékos neve</string>
+  <string name="TR_SCREENPROFILES_GAMEDIFFICULTY">Nehézségi szint</string>
   <string name="TR_SCREENPROFILES_AVATAR">Profilkép</string>
-  <string name="TR_SCREENPROFILES_USERROLE">Szerepkor</string>
+  <string name="TR_SCREENPROFILES_USERROLE">Szerepkör</string>
   <string name="TR_SCREENPROFILES_ACTIVE">Jelenlegi</string>
   <string name="TR_SCREENPROFILES_BUTTON_NEW">Új</string>
   <string name="TR_SCREENPROFILES_BUTTON_DELETE">Törlés</string>
-  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Pillanatkép Készítése</string>
-  <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Pillanatkép Mentése</string>
-  <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Pillanatkép Törlése</string>
+  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Pillanatkép készítése</string>
+  <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Pillanatkép mentése</string>
+  <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Pillanatkép törlése</string>
   <string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Webkamera</string>
-  <string name="TR_SCREENO_OPTIONS">Menü Beállítások</string>
+  <string name="TR_SCREENO_OPTIONS">Beállítások</string>
   <string name="TR_SCREENO_BUTTON_GAME">Játék</string>
   <string name="TR_SCREENO_BUTTON_SOUND">Hang</string>
   <string name="TR_SCREENO_BUTTON_RECORD">Mikrofon</string>
@@ -170,44 +177,51 @@
   <string name="TR_SCREENOGAME_BUTTON_SERVER">Szerver címe</string>
   <string name="TR_SCREENOGAME_OPTIONS">Játék Beállítások</string>
   <string name="TR_SCREENOGAME_LANGUAGE">Nyelv</string>
-  <string name="TR_SCREENOGAME_DEBUGLEVEL">Debug Level</string>
-  <string name="TR_SCREENOGAME_SONGMENU">Dal Menü</string>
-  <string name="TR_SCREENOGAME_SONGSORTING">Dalok Rendezése</string>
+  <string name="TR_SCREENOGAME_DEBUGLEVEL">Hibakeresési mód</string>
+  <string name="TR_SCREENOGAME_SONGMENU">Dalválasztó stílusa</string>
+  <string name="TR_SCREENOGAME_SONGSORTING">Dalok rendezése</string>
   <string name="TR_SCREENOGAME_TABS">Rendezés</string>
-  <string name="TR_SCREENOGAME_DIFFICULTY">Játék Nehézsége</string>
-  <string name="TR_SCREENOGAME_TIMERMODE">Idő Mutatás</string>
+  <string name="TR_SCREENOGAME_DIFFICULTY">Nehézségi szint</string>
+  <string name="TR_SCREENOGAME_TIMERMODE">Idő mutatása</string>
   <string name="TR_SCREENORECORD_OPTIONS">Mikrofon Beállítások</string>
   <string name="TR_SCREENORECORD_DEVICE">Eszköz</string>
   <string name="TR_SCREENORECORD_INPUT">Bemenet</string>
-  <string name="TR_SCREENORECORD_MIC_DELAY">Mikrofon Késleltetés</string>
+  <string name="TR_SCREENORECORD_PLAYER_1">1. játékos</string>
+  <string name="TR_SCREENORECORD_PLAYER_2">2. játékos</string>
+  <string name="TR_SCREENORECORD_PLAYER_3">3. játékos</string>
+  <string name="TR_SCREENORECORD_PLAYER_4">4. játékos</string>
+  <string name="TR_SCREENORECORD_PLAYER_5">5. játékos</string>
+  <string name="TR_SCREENORECORD_PLAYER_6">6. játékos</string>
+  <string name="TR_SCREENORECORD_MIC_DELAY">Mikrofon késleltetés</string>
   <string name="TR_SCREENORECORD_MIC_WARNING">Figyelem: Egy játékos két mikrofont használ.</string>
-  <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Késleltetés Tesztelése</string>
+  <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Késleltetés tesztelése</string>
   <string name="TR_SCREENOSOUND_OPTIONS">Hang Beállítások</string>
   <string name="TR_SCREENOSOUND_BACKGROUNDMUSIC">Háttérzene</string>
-  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Háttérzene Hangereje</string>
-  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Háttérzene Forrása</string>
-  <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Előnézeti Zene Hangereje</string>
-  <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Zene Hangereje</string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Háttérzene hangereje</string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Háttérzene forrása</string>
+  <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Előlnézeti zene hangereje</string>
+  <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Játékbeli zene hangereje</string>
   <string name="TR_SCREENOTHEME_OPTIONS">Téma Beállítások</string>
   <string name="TR_SCREENOTHEME_THEME">Téma</string>
   <string name="TR_SCREENOTHEME_SKIN">Kinézet</string>
-  <string name="TR_SCREENOTHEME_COVERTHEME">Borító Téma</string>
-  <string name="TR_SCREENOTHEME_NOTELINES">Kotta Mutatása</string>
-  <string name="TR_SCREENOTHEME_TONEHELPER">Hangmagasság Segítő Mutatása</string>
-  <string name="TR_SCREENOTHEME_TIMERLOOK">Idősáv Nézete</string>
-  <string name="TR_SCREENOTHEME_FADEINFO">Játékos Infó Halványan</string>
-  <string name="TR_SCREENOTHEME_COVERLOADING">Borító Betöltés</string>
+  <string name="TR_SCREENOTHEME_COVERTHEME">Borító téma</string>
+  <string name="TR_SCREENOTHEME_NOTELINES">Kottavonalak mutatása</string>
+  <string name="TR_SCREENOTHEME_TONEHELPER">Hangmagasság-segítő mutatása</string>
+  <string name="TR_SCREENOTHEME_TIMERLOOK">Idősáv</string>
+  <string name="TR_SCREENOTHEME_FADEINFO">Játékos infó halványítása</string>
+  <string name="TR_SCREENOTHEME_COVERLOADING">Borító betöltés</string>
   <string name="TR_SCREENOLYRICS_OPTIONS">Dalszöveg Beállítások</string>
-  <string name="TR_SCREENOLYRICS_STYLE">Stílus</string>
+  <string name="TR_SCREENOLYRICS_STYLE">Animációs stílus</string>
   <string name="TR_SCREENOLYRICS_POSITION">Dalszöveg helyzete</string>
   <string name="TR_SCREENOVIDEO_OPTIONS">Képi Beállítások</string>
-  <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Animált Háttér</string>
-  <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Videó Előnézet</string>
+  <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Videóháttér</string>
+  <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Videó előnézet</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Videó Éneklés Közben</string>
-  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Jelenlegi Háttérzene Videó Mutatása</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Jelenlegi háttérzene videójának mutatása</string>
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webkamerák</string>
-  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webkamera-felbontás</string>
-  <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Képernyő pozicionálás</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webkamera felbontása</string>
+  <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Képernyő pozícionálás</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Pozícionálás: CTRL + ALT (+SHIFT) + Nyilak</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">Visszaállítás: CTRL + ALT + 0</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Bal felső</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Jobb felső</string>
diff --git a/Output/Languages/Italian.xml b/Output/Languages/Italian.xml
index df414128..8fce81fc 100644
--- a/Output/Languages/Italian.xml
+++ b/Output/Languages/Italian.xml
@@ -46,12 +46,11 @@
   <string name="TR_CONFIG_LEVEL2">Livello 2</string>
   <string name="TR_CONFIG_LEVEL3">Livello 3</string>
   <string name="TR_CONFIG_LEVEL_MAX">Max</string>
-  <string name="TR_CONFIG_LIST">Lista canzoni</string>
   <string name="TR_CONFIG_DREIDEL">Dreidel</string>
   <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>
@@ -114,10 +113,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>
@@ -182,6 +181,12 @@
   <string name="TR_SCREENORECORD_OPTIONS">Opzioni registrazione</string>
   <string name="TR_SCREENORECORD_DEVICE">Dispositivo</string>
   <string name="TR_SCREENORECORD_INPUT">Input</string>
+  <string name="TR_SCREENORECORD_PLAYER_1">Giocatore 1</string>
+  <string name="TR_SCREENORECORD_PLAYER_2">Giocatore 2</string>
+  <string name="TR_SCREENORECORD_PLAYER_3">Giocatore 3</string>
+  <string name="TR_SCREENORECORD_PLAYER_4">Giocatore 4</string>
+  <string name="TR_SCREENORECORD_PLAYER_5">Giocatore 5</string>
+  <string name="TR_SCREENORECORD_PLAYER_6">Giocatore 6</string>
   <string name="TR_SCREENORECORD_MIC_DELAY">Ritardo microfono</string>
   <string name="TR_SCREENORECORD_MIC_WARNING">Attenzione: Ad un giocatore sono assegnati due microfoni.</string>
   <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Test ritardo</string>
@@ -211,7 +216,7 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcam</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Risoluzione-Webcam</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Sistemazione schermo</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Premi CTR + ALT (+ SHIFT) + Freccia|\"+\" per sistemare lo schermo</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Premi CTR + ALT (+ SHIFT) + Freccia|"+ per sistemare lo schermo</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + 0 per ripristinare</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Sopra a sinistra</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Sopra a destra</string>
diff --git a/Output/Languages/Portuguese.xml b/Output/Languages/Portuguese.xml
index dd66ff44..b4b22541 100644
--- a/Output/Languages/Portuguese.xml
+++ b/Output/Languages/Portuguese.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="language">Português</string>
+  <string name="language">Inglês</string>
   <string name="TR_PROGRAM_NAME">Vocaluxe</string>
   <string name="TR_GENERAL_AND">e</string>
   <string name="TR_BUTTON_EXIT">Sair</string>
@@ -11,7 +11,7 @@
   <string name="TR_DEBUG_VIDEO_STREAMS">Stream de Video</string>
   <string name="TR_DEBUG_TEXTURES">Texturas</string>
   <string name="TR_DEBUG_TONE_ABS">Abdominais </string>
-  <string name="TR_DEBUG_MAX_VOLUME">Volume Máximo </string>
+  <string name="TR_DEBUG_MAX_VOLUME">Volume Máximo</string>
   <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>
@@ -48,17 +48,17 @@
   <string name="TR_CONFIG_LEVEL_MAX">Máximo</string>
   <string name="TR_CONFIG_LIST">Lista</string>
   <string name="TR_CONFIG_DREIDEL">Contra-Relógio </string>
-  <string name="TR_CONFIG_TILE_BOARD">Painel de Titulo </string>
+  <string name="TR_CONFIG_TILE_BOARD">Painel de Titulo</string>
   <string name="TR_CONFIG_BOOK">Livro</string>
   <string name="TR_CONFIG_COVERLOADING_ONDEMAND">A pedido</string>
-  <string name="TR_CONFIG_COVERLOADING_ATSTART">No início </string>
+  <string name="TR_CONFIG_COVERLOADING_ATSTART">No início</string>
   <string name="TR_CONFIG_COVERLOADING_DYNAMIC">Dinâmico</string>
   <string name="TR_CONFIG_NONE">Nenhum</string>
   <string name="TR_CONFIG_RANDOM">Aleatório</string>
   <string name="TR_CONFIG_FOLDER">Pasta</string>
   <string name="TR_CONFIG_ARTIST">Artista</string>
   <string name="TR_CONFIG_ARTIST_LETTER">Letra do Artista</string>
-  <string name="TR_CONFIG_TITLE_LETTER">Letras do Titulo </string>
+  <string name="TR_CONFIG_TITLE_LETTER">Letras do Titulo</string>
   <string name="TR_CONFIG_EDITION">Edição</string>
   <string name="TR_CONFIG_GENRE">Género</string>
   <string name="TR_CONFIG_YEAR">Ano</string>
@@ -74,8 +74,8 @@
   <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
   <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Expandida</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>
+  <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>
   <string name="TR_CONFIG_ONLY_SONG">Apenas a musica seleccionada</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_ALL">Todas</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Apenas nomes e avatares</string>
@@ -133,7 +133,7 @@
   <string name="TR_SCREENSONG_NEWPLAYLIST">Nova Lista de Reprodução</string>
   <string name="TR_SCREENSONG_SONGOPTIONS">Opções da Música</string>
   <string name="TR_SCREENSONG_SEARCH">Procura:</string>
-  <string name="TR_SCREENSONG_NOLANGUAGE">Sem Lingua </string>
+  <string name="TR_SCREENSONG_NOLANGUAGE">Sem Lingua</string>
   <string name="TR_SCREENSONG_NOYEAR">Sem Ano</string>
   <string name="TR_SCREENSONG_NOGENRE">Sem Género </string>
   <string name="TR_SCREENSONG_NOEDITION">Sem Edição </string>
@@ -159,11 +159,11 @@
   <string name="TR_SCREENPROFILES_ACTIVE">Activa</string>
   <string name="TR_SCREENPROFILES_BUTTON_NEW">Nova</string>
   <string name="TR_SCREENPROFILES_BUTTON_DELETE">Eliminar</string>
-  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Tirar Fotografia </string>
+  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Tirar Fotografia</string>
   <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Gravar Fotografia</string>
   <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Eliminar Fotografia</string>
   <string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Câmara Web </string>
-  <string name="TR_SCREENO_OPTIONS">Opções do Menu </string>
+  <string name="TR_SCREENO_OPTIONS">Opções do Menu</string>
   <string name="TR_SCREENO_BUTTON_GAME">Jogo</string>
   <string name="TR_SCREENO_BUTTON_SOUND">Som </string>
   <string name="TR_SCREENO_BUTTON_RECORD">Gravar</string>
@@ -175,20 +175,24 @@
   <string name="TR_SCREENOGAME_LANGUAGE">Língua</string>
   <string name="TR_SCREENOGAME_DEBUGLEVEL">Nível de Debug</string>
   <string name="TR_SCREENOGAME_SONGMENU">Menu das Músicas</string>
-  <string name="TR_SCREENOGAME_SONGSORTING">Ordenação das Musicas </string>
+  <string name="TR_SCREENOGAME_SONGSORTING">Ordenação das Musicas</string>
   <string name="TR_SCREENOGAME_TABS">Separadores </string>
   <string name="TR_SCREENOGAME_DIFFICULTY">Dificildade do Jogo</string>
   <string name="TR_SCREENOGAME_TIMERMODE">Modo Temporizado</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>
-  <string name="TR_SCREENORECORD_CHANNEL_1">Canal 1</string>
-  <string name="TR_SCREENORECORD_CHANNEL_2">Canal 2</string>
+  <string name="TR_SCREENORECORD_PLAYER_1">Jogador 1</string>
+  <string name="TR_SCREENORECORD_PLAYER_2">Jogador 2</string>
+  <string name="TR_SCREENORECORD_PLAYER_3">Jogador 3</string>
+  <string name="TR_SCREENORECORD_PLAYER_4">Jogador 4</string>
+  <string name="TR_SCREENORECORD_PLAYER_5">Jogador 5</string>
+  <string name="TR_SCREENORECORD_PLAYER_6">Jogador 6</string>
   <string name="TR_SCREENORECORD_MIC_DELAY">Latência do Microfone</string>
   <string name="TR_SCREENORECORD_MIC_WARNING">Atenção: Pelo menos um jogador tem dois microfones atribuídos </string>
   <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Teste de Latência</string>
   <string name="TR_SCREENOSOUND_OPTIONS">Opções de Som</string>
-  <string name="TR_SCREENOSOUND_BACKGROUNDMUSIC">Música de Fundo </string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSIC">Música de Fundo</string>
   <string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Volume da Música de Fundo</string>
   <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Origem da Música de Fundo</string>
   <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Prévisualizar Volume da Música</string>
@@ -200,7 +204,7 @@
   <string name="TR_SCREENOTHEME_NOTELINES">Mostrar Linhas das Notas</string>
   <string name="TR_SCREENOTHEME_TONEHELPER">Mostrar Ajuda de Afinação</string>
   <string name="TR_SCREENOTHEME_TIMERLOOK">Aspecto do Cronómetro</string>
-  <string name="TR_SCREENOTHEME_FADEINFO">Desvanecer informação do jogado </string>
+  <string name="TR_SCREENOTHEME_FADEINFO">Desvanecer informação do jogado</string>
   <string name="TR_SCREENOTHEME_COVERLOADING">Comportamento do Carregamento das Capas</string>
   <string name="TR_SCREENOLYRICS_OPTIONS">Opções das Letras das Músicas</string>
   <string name="TR_SCREENOLYRICS_STYLE">Estilo</string>
@@ -213,7 +217,7 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Camaras Web</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Resolução da Câmara Web</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Ajustes do Ecrã </string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Prima CTR + ALT (+ SHIFT) + Setas|\"+\" para ajustar o ecrã</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Prima CTR + ALT (+ SHIFT) + Setas|"+" para ajustar o ecrã</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + 0 para reiniciar</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Superior Esquerdo</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Superior Direito</string>
diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml
index 62a482ac..ed040314 100644
--- a/Output/Languages/Spanish.xml
+++ b/Output/Languages/Spanish.xml
@@ -89,48 +89,25 @@
   <string name="TR_SCREENLOAD_LOADED">cargadas</string>
   <string name="TR_SCREENMAIN_MENU">Menú Principal</string>
   <string name="TR_SCREENMAIN_BUTTON_SING">Cantar</string>
-  <string name="TR_SCREENMAIN_BUTTON_PARTY">TODO: Party</string>
   <string name="TR_SCREENMAIN_BUTTON_OPTIONS">Opciones</string>
   <string name="TR_SCREENMAIN_BUTTON_PROFILES">Perfiles</string>
   <string name="TR_SCREENMAIN_TEXT_NOPROFILES">¡No se encuentra perfil!</string>
-  <string name="TR_SCREENPARTY_TITLE">TODO: Party Mode Selection</string>
-  <string name="TR_SCREENPARTY_MODES">TODO: Party Mode</string>
-  <string name="TR_SCREENPARTY_DESCRIPTION">TODO: Description</string>
-  <string name="TR_SCREENPARTY_AUTHOR">TODO: Author</string>
-  <string name="TR_SCREENPARTY_VERSION">TODO: Version</string>
-  <string name="TR_SCREENPARTY_ERROR">TODO: Can\'t load this party-mode.</string>
   <string name="TR_SCREENPARTY_ERROR_MICS">¡No hay micrófonos configurados!</string>
   <string name="TR_SCREENPARTY_ERROR_MIC_NUM">¡Se necesitan %d micrófonos para este modo fiesta!</string>
-  <string name="TR_SCREENPARTY_TARGETAUDIENCE">TODO: Target audience</string>
-  <string name="TR_SCREENPARTY_NOTEAMS">TODO: No Teams</string>
-  <string name="TR_SCREENPARTY_NUMTEAMS">TODO: Number of teams</string>
-  <string name="TR_SCREENPARTY_NUMPLAYERS">TODO: Number of players</string>
   <string name="TR_SCREENNAMES_MENU">Selección de Jugadores</string>
   <string name="TR_SCREENNAMES_PLAYER">Jugador</string>
-  <string name="TR_SCREENNAMES_1PLAYER">Jugador 1</string>
-  <string name="TR_SCREENNAMES_2PLAYER">Jugador 2</string>
-  <string name="TR_SCREENNAMES_3PLAYER">Jugador 3</string>
-  <string name="TR_SCREENNAMES_4PLAYER">Jugador 4</string>
-  <string name="TR_SCREENNAMES_5PLAYER">Jugador 5</string>
-  <string name="TR_SCREENNAMES_6PLAYER">Jugador 6</string>
+  <string name="TR_SCREENNAMES_1PLAYER">1 Jugador</string>
+  <string name="TR_SCREENNAMES_2PLAYER">2 Jugadores</string>
+  <string name="TR_SCREENNAMES_3PLAYER">3 Jugadores</string>
+  <string name="TR_SCREENNAMES_4PLAYER">4 Jugadores</string>
+  <string name="TR_SCREENNAMES_5PLAYER">5 Jugadores</string>
+  <string name="TR_SCREENNAMES_6PLAYER">6 Jugadores</string>
   <string name="TR_SCREENNAMES_WARNING_MICS_SG">Advertencia: ¡No hay micrófonos asignados al jugador %v!</string>
   <string name="TR_SCREENNAMES_WARNING_MICS_PL">Advertencia: ¡No hay micrófonos asignados a los jugadores %v!</string>
   <string name="TR_SCREENNAMES_WARNING_PROFILES_SG">Advertencia: ¡No hay perfil asignados al jugador %v!</string>
   <string name="TR_SCREENNAMES_WARNING_PROFILES_PL">Advertencia: ¡No hay perfiles asignados a los jugadores %v!</string>
   <string name="TR_SCREENSONG_MENU">Selección de Canciones</string>
-  <string name="TR_SCREENSONG_BUTTON_SING">TODO: Sing</string>
-  <string name="TR_SCREENSONG_BUTTON_PLAYLIST">TODO: Add to playlist</string>
-  <string name="TR_SCREENSONG_BUTTON_CANCEL">TODO: Close</string>
-  <string name="TR_SCREENSONG_BUTTON_RANDOM">TODO: Select a random song</string>
-  <string name="TR_SCREENSONG_BUTTON_RANDOMCAT">TODO: Select a random category</string>
-  <string name="TR_SCREENSONG_BUTTON_SINGALL">TODO: Sing all songs</string>
-  <string name="TR_SCREENSONG_BUTTON_SINGALLVISIBLE">TODO: Sing all visible songs</string>
-  <string name="TR_SCREENSONG_BUTTON_OPENPLAYLIST">TODO: Open playlist</string>
   <string name="TR_SCREENSONG_BUTTON_OPEN_SELECTED_ITEM">Seleccionar</string>
-  <string name="TR_SCREENSONG_BUTTON_RANDOMMEDLEY">TODO: Sing a random medley</string>
-  <string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">TODO: Sing medley-songs</string>
-  <string name="TR_SCREENSONG_NEWPLAYLIST">TODO: New Playlist</string>
-  <string name="TR_SCREENSONG_SONGOPTIONS">TODO: Song Options</string>
   <string name="TR_SCREENSONG_SEARCH">Buscar:</string>
   <string name="TR_SCREENSONG_NOLANGUAGE">Sin Idioma</string>
   <string name="TR_SCREENSONG_NOYEAR">Sin Año</string>
@@ -181,6 +158,12 @@
   <string name="TR_SCREENORECORD_OPTIONS">Opciones de Grabación</string>
   <string name="TR_SCREENORECORD_DEVICE">Dispositivo</string>
   <string name="TR_SCREENORECORD_INPUT">Entrada</string>
+  <string name="TR_SCREENORECORD_PLAYER_1">Jugador 1</string>
+  <string name="TR_SCREENORECORD_PLAYER_2">Jugador 2</string>
+  <string name="TR_SCREENORECORD_PLAYER_3">Jugador 3</string>
+  <string name="TR_SCREENORECORD_PLAYER_4">Jugador 4</string>
+  <string name="TR_SCREENORECORD_PLAYER_5">Jugador 5</string>
+  <string name="TR_SCREENORECORD_PLAYER_6">Jugador 6</string>
   <string name="TR_SCREENORECORD_MIC_DELAY">Retraso del Micrófono</string>
   <string name="TR_SCREENORECORD_MIC_WARNING">Advertencia: Al menos un jugador ha sido asignado a dos micrófonos.</string>
   <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Prueba de Retraso</string>
@@ -196,7 +179,7 @@
   <string name="TR_SCREENOTHEME_COVERTHEME">Estilo de Carátulas</string>
   <string name="TR_SCREENOTHEME_NOTELINES">Mostrar Líneas de las Notas</string>
   <string name="TR_SCREENOTHEME_TONEHELPER">Mostrar Guía de Tonos</string>
-  <string name="TR_SCREENOTHEME_TIMERLOOK">Aspecto del Timer</string>
+  <string name="TR_SCREENOTHEME_TIMERLOOK">Aspecto del Time</string>
   <string name="TR_SCREENOTHEME_FADEINFO">Desvanecer información del jugador</string>
   <string name="TR_SCREENOTHEME_COVERLOADING">Comportamiento de la Carga de Carátulas</string>
   <string name="TR_SCREENOLYRICS_OPTIONS">Opciones de la letra</string>
@@ -208,9 +191,9 @@
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Videos al Cantar</string>
   <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Mostrar el vídeo de fondo actual</string>
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Cámaras web</string>
-  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Resolución cámara web</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Cámaras web</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Ajustes de pantalla</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Presione CTRL + ALT (+ SHIFT) + Flechas|\"+\" para ajustar la pantalla</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Presione CTRL + ALT (+ SHIFT) + Flechas|"+" para ajustar la pantalla</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTRL + ALT + SHIFT + 0 para reiniciar</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Arriba izquierda</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Abajo derecha</string>
diff --git a/Output/Languages/Swedish.xml b/Output/Languages/Swedish.xml
index d078b7d1..ce379ac1 100644
--- a/Output/Languages/Swedish.xml
+++ b/Output/Languages/Swedish.xml
@@ -11,26 +11,26 @@
   <string name="TR_DEBUG_VIDEO_STREAMS">Videoströmmar</string>
   <string name="TR_DEBUG_TEXTURES">Texturer</string>
   <string name="TR_DEBUG_TONE_ABS">ToneAbs</string>
-  <string name="TR_DEBUG_MAX_VOLUME">Max Volym</string>
-  <string name="TR_DEBUG_SONGS">Laddade låtar</string>
+  <string name="TR_DEBUG_MAX_VOLUME">Max volym</string>
+  <string name="TR_DEBUG_SONGS">Laddade sånger</string>
   <string name="TR_DEBUG_MOUSE">Mus</string>
   <string name="TR_DEBUG_MEMORY">Minnesanvändning</string>
   <string name="TR_GAMEMODE_NORMAL">Normal</string>
   <string name="TR_GAMEMODE_DUET">Duett</string>
   <string name="TR_GAMEMODE_MEDLEY">Medley</string>
   <string name="TR_GAMEMODE_SHORTSONG">Kort version</string>
-  <string name="TR_RATING_VOCAL_HERO">Sånghjälte</string>
+  <string name="TR_RATING_VOCAL_HERO">Vokal Hjälte</string>
   <string name="TR_RATING_SUPERSTAR">Superstjärna</string>
   <string name="TR_RATING_LEAD_SINGER">Frontsångare</string>
-  <string name="TR_RATING_RISING_STAR">Stigande stjärna</string>
-  <string name="TR_RATING_HOPEFUL">Hoppfull</string>
-  <string name="TR_RATING_WANNABE">Novis</string>
+  <string name="TR_RATING_RISING_STAR">Stigande Stjärna</string>
+  <string name="TR_RATING_HOPEFUL">Hoppfullt</string>
+  <string name="TR_RATING_WANNABE">Vill Gärna</string>
   <string name="TR_RATING_AMATEUR">Amatör</string>
   <string name="TR_RATING_TONE_DEAF">Tondöv</string>
   <string name="TR_USERROLE_GUEST">Gäst</string>
   <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_USERROLE_KEYBOARDUSER">Tangentbord användare</string>
   <string name="TR_CONFIG_SOFTWARE">Mjukvara</string>
   <string name="TR_CONFIG_OPENGL">OpenGL</string>
   <string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -41,14 +41,14 @@
   <string name="TR_CONFIG_TEXTURE_HIGHEST">Högsta</string>
   <string name="TR_CONFIG_OFF">Av</string>
   <string name="TR_CONFIG_ON">På</string>
-  <string name="TR_CONFIG_ONLY_FPS">Endast bildfrekvens</string>
+  <string name="TR_CONFIG_ONLY_FPS">Endast FPS</string>
   <string name="TR_CONFIG_LEVEL1">Nivå 1</string>
   <string name="TR_CONFIG_LEVEL2">Nivå 2</string>
   <string name="TR_CONFIG_LEVEL3">Nivå 3</string>
   <string name="TR_CONFIG_LEVEL_MAX">Max</string>
   <string name="TR_CONFIG_LIST">Lista</string>
   <string name="TR_CONFIG_DREIDEL">Dreidel</string>
-  <string name="TR_CONFIG_TILE_BOARD">Rutnät</string>
+  <string name="TR_CONFIG_TILE_BOARD">Brickor</string>
   <string name="TR_CONFIG_BOOK">Bok</string>
   <string name="TR_CONFIG_COVERLOADING_ONDEMAND">På begäran</string>
   <string name="TR_CONFIG_COVERLOADING_ATSTART">Vid uppstart</string>
@@ -59,20 +59,22 @@
   <string name="TR_CONFIG_ARTIST">Artist</string>
   <string name="TR_CONFIG_ARTIST_LETTER">Artist efter bokstav</string>
   <string name="TR_CONFIG_TITLE_LETTER">Titel efter bokstav</string>
-  <string name="TR_CONFIG_EDITION">Utgåva</string>
+  <string name="TR_CONFIG_EDITION">Edition</string>
   <string name="TR_CONFIG_GENRE">Genre</string>
   <string name="TR_CONFIG_YEAR">År</string>
   <string name="TR_CONFIG_DECADE">Årtionde</string>
   <string name="TR_CONFIG_LANGUAGE">Språk</string>
   <string name="TR_CONFIG_DATEADDED">Tillagd datum</string>
   <string name="TR_CONFIG_EASY">Lätt</string>
-  <string name="TR_CONFIG_NORMAL">Medel</string>
-  <string name="TR_CONFIG_HARD">Svår</string>
-  <string name="TR_CONFIG_TIMERMODE_CURRENT">Aktuell</string>
+  <string name="TR_CONFIG_NORMAL">Normalt</string>
+  <string name="TR_CONFIG_HARD">Svårt</string>
+  <string name="TR_CONFIG_TIMERMODE_CURRENT">Nuvarande</string>
   <string name="TR_CONFIG_TIMERMODE_REMAINING">Återstående</string>
-  <string name="TR_CONFIG_TIMERMODE_TOTAL">Total</string>
+  <string name="TR_CONFIG_TIMERMODE_TOTAL">Totalt</string>
   <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
   <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Utvidgad</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_ALL">Lista Alla</string>
+  <string name="TR_CONFIG_HIGHSCORE_LIST_BEST">Lista bästa</string>
   <string name="TR_CONFIG_OWN_MUSIC">Egen musik och bakgrundsmusik</string>
   <string name="TR_CONFIG_NO_OWN_MUSIC">Ingen egen musik</string>
   <string name="TR_CONFIG_ONLY_OWN_MUSIC">Endast egen musik</string>
@@ -82,7 +84,7 @@
   <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Ingenting</string>
   <string name="TR_CONFIG_LYRICSTYLE_FILL">Fyll</string>
   <string name="TR_CONFIG_LYRICSTYLE_JUMP">Hoppa</string>
-  <string name="TR_CONFIG_LYRICSTYLE_SLIDE">Svep</string>
+  <string name="TR_CONFIG_LYRICSTYLE_SLIDE">Skjut</string>
   <string name="TR_CONFIG_LYRICSTYLE_ZOOM">Zooma</string>
   <string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Nederst</string>
   <string name="TR_CONFIG_LYRICSPOSITION_TOP">Överst</string>
@@ -91,99 +93,100 @@
   <string name="TR_SCREENLOAD_LOADING">Laddar</string>
   <string name="TR_SCREENLOAD_TOTAL">Totalt</string>
   <string name="TR_SCREENLOAD_SONGS">låtar</string>
-  <string name="TR_SCREENLOAD_LOADED">laddat</string>
-  <string name="TR_SCREENMAIN_MENU">Huvudmeny</string>
+  <string name="TR_SCREENLOAD_LOADED">Laddad</string>
+  <string name="TR_SCREENMAIN_MENU">Huvud Meny</string>
   <string name="TR_SCREENMAIN_BUTTON_SING">Sjung</string>
   <string name="TR_SCREENMAIN_BUTTON_PARTY">Party</string>
   <string name="TR_SCREENMAIN_BUTTON_OPTIONS">Alternativ</string>
   <string name="TR_SCREENMAIN_BUTTON_PROFILES">Profiler</string>
   <string name="TR_SCREENMAIN_TEXT_NOPROFILES">Inga profiler funna!</string>
-  <string name="TR_SCREENPARTY_TITLE">Val av partyläge</string>
-  <string name="TR_SCREENPARTY_MODES">Partyläge</string>
+  <string name="TR_SCREENPARTY_TITLE">Party-lägesval</string>
+  <string name="TR_SCREENPARTY_MODES">Party-läge</string>
   <string name="TR_SCREENPARTY_DESCRIPTION">Beskrivning</string>
-  <string name="TR_SCREENPARTY_AUTHOR">Skapare</string>
+  <string name="TR_SCREENPARTY_AUTHOR">Författare</string>
   <string name="TR_SCREENPARTY_VERSION">Version</string>
-  <string name="TR_SCREENPARTY_ERROR">Kan ej ladda detta partyläge</string>
+  <string name="TR_SCREENPARTY_ERROR">kan ej ladda detta party läge</string>
   <string name="TR_SCREENPARTY_ERROR_MICS">Det finns inga mikrofoner konfigurerade!</string>
-  <string name="TR_SCREENPARTY_ERROR_MIC_NUM">%d mikrofoner krävs för denna partyläge!</string>
-  <string name="TR_SCREENPARTY_TARGETAUDIENCE">Målgrupp</string>
+  <string name="TR_SCREENPARTY_ERROR_MIC_NUM">%d mikrofoner krävs för denna party-mode!</string>
+  <string name="TR_SCREENPARTY_TARGETAUDIENCE">Mål publik</string>
   <string name="TR_SCREENPARTY_NOTEAMS">Inga lag</string>
   <string name="TR_SCREENPARTY_NUMTEAMS">Antal lag</string>
   <string name="TR_SCREENPARTY_NUMPLAYERS">Antal spelare</string>
-  <string name="TR_SCREENNAMES_MENU">Val av spelare</string>
+  <string name="TR_SCREENNAMES_MENU">Spelarväljare</string>
   <string name="TR_SCREENNAMES_PLAYER">Spelare</string>
-  <string name="TR_SCREENNAMES_1PLAYER">1 spelare</string>
-  <string name="TR_SCREENNAMES_2PLAYER">2 spelare</string>
-  <string name="TR_SCREENNAMES_3PLAYER">3 spelare</string>
-  <string name="TR_SCREENNAMES_4PLAYER">4 spelare</string>
-  <string name="TR_SCREENNAMES_5PLAYER">5 spelare</string>
-  <string name="TR_SCREENNAMES_6PLAYER">6 spelare</string>
-  <string name="TR_SCREENNAMES_WARNING_MICS_SG">Varning: Det finns ingen mikrofon tilldelad spelare %v!</string>
-  <string name="TR_SCREENNAMES_WARNING_MICS_PL">Varning: Det finns inga mikrofoner tilldelade spelare %v!</string>
+  <string name="TR_SCREENNAMES_1PLAYER">1 Spelare</string>
+  <string name="TR_SCREENNAMES_2PLAYER">2 Spelare</string>
+  <string name="TR_SCREENNAMES_3PLAYER">3 Spelare</string>
+  <string name="TR_SCREENNAMES_4PLAYER">4 Spelare</string>
+  <string name="TR_SCREENNAMES_5PLAYER">5 Spelare</string>
+  <string name="TR_SCREENNAMES_6PLAYER">6 Spelare</string>
+  <string name="TR_SCREENNAMES_WARNING_MICS_SG">Varning: Det finns ingen Mic tilldelad Spelare %v!</string>
+  <string name="TR_SCREENNAMES_WARNING_MICS_PL">Varning: Det finns ingen Micar tilldelad Spelarna %v!</string>
   <string name="TR_SCREENNAMES_WARNING_PROFILES_SG">Varning: Det finns ingen profil för spelare %v!</string>
   <string name="TR_SCREENNAMES_WARNING_PROFILES_PL">Varning: Det finns inga profiler för spelare %v!</string>
   <string name="TR_SCREENSONG_MENU">Låtval</string>
   <string name="TR_SCREENSONG_BUTTON_SING">Sjung</string>
-  <string name="TR_SCREENSONG_BUTTON_PLAYLIST">Lägg till spellista</string>
+  <string name="TR_SCREENSONG_BUTTON_PLAYLIST">Lägg till Spellista</string>
   <string name="TR_SCREENSONG_BUTTON_CANCEL">Stäng</string>
   <string name="TR_SCREENSONG_BUTTON_RANDOM">Välj slumpmässig låt</string>
-  <string name="TR_SCREENSONG_BUTTON_RANDOMCAT">Välj slumpmässig kategori</string>
+  <string name="TR_SCREENSONG_BUTTON_RANDOMCAT">Välg slumpmässig kategori</string>
   <string name="TR_SCREENSONG_BUTTON_SINGALL">Sjung alla låtar</string>
   <string name="TR_SCREENSONG_BUTTON_SINGALLVISIBLE">Sjung alla synliga låtar</string>
   <string name="TR_SCREENSONG_BUTTON_OPENPLAYLIST">Öppna spellista</string>
   <string name="TR_SCREENSONG_BUTTON_OPEN_SELECTED_ITEM">Välj</string>
   <string name="TR_SCREENSONG_BUTTON_RANDOMMEDLEY">Sjung slumpmässig medley</string>
-  <string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Sjung medleylåt</string>
-  <string name="TR_SCREENSONG_NEWPLAYLIST">Ny spellista</string>
-  <string name="TR_SCREENSONG_SONGOPTIONS">Låtalternativ</string>
+  <string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Sjung medley-låt</string>
+  <string name="TR_SCREENSONG_NEWPLAYLIST">Ny Spellista</string>
+  <string name="TR_SCREENSONG_SONGOPTIONS">Låt Alternativ</string>
   <string name="TR_SCREENSONG_SEARCH">Sök:</string>
   <string name="TR_SCREENSONG_NOLANGUAGE">Inget språk</string>
-  <string name="TR_SCREENSONG_NOYEAR">Inget år</string>
-  <string name="TR_SCREENSONG_NOGENRE">Ingen genre</string>
-  <string name="TR_SCREENSONG_NOEDITION">Ingen utgåva</string>
-  <string name="TR_SCREENSONG_ALLSONGS">Alla låtar</string>
+  <string name="TR_SCREENSONG_NOYEAR">Inget År</string>
+  <string name="TR_SCREENSONG_NOGENRE">Ingen Genre</string>
+  <string name="TR_SCREENSONG_NOEDITION">Ingen Edition</string>
+  <string name="TR_SCREENSONG_ALLSONGS">Alla Låtar</string>
   <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_SCREENSING_PAUSE">Paus</string>
-  <string name="TR_SCREENSING_BUTTON_CANCEL">Avsluta låt</string>
+  <string name="TR_SCREENSING_BUTTON_CANCEL">Stoppa 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_SKIP">Hoppa över Låt</string>
   <string name="TR_SCREENSCORE_SCORES">Resultat</string>
   <string name="TR_SCREENSCORE_RATING">Rankning</string>
   <string name="TR_SCREENSCORE_POINTS">Poäng</string>
   <string name="TR_SCREENSCORE_GAMEDIFFICULTY">Svårighetsgrad</string>
   <string name="TR_SCREENSCORE_OVERALLSCORE">Totalpoäng</string>
-  <string name="TR_SCREENHIGHSCORE_HIGHSCORE">Topplista</string>
+  <string name="TR_SCREENHIGHSCORE_HIGHSCORE">Highscore</string>
   <string name="TR_SCREENPROFILES_PROFILES">Profiler</string>
-  <string name="TR_SCREENPROFILES_PLAYERNAME">Spelarnamn</string>
+  <string name="TR_SCREENPROFILES_PLAYERNAME">Spelarens namn</string>
   <string name="TR_SCREENPROFILES_GAMEDIFFICULTY">Svårighetsgrad</string>
-  <string name="TR_SCREENPROFILES_AVATAR">Profilbild</string>
-  <string name="TR_SCREENPROFILES_USERROLE">Användarroll</string>
+  <string name="TR_SCREENPROFILES_AVATAR">Avatar</string>
+  <string name="TR_SCREENPROFILES_USERROLE">Användares roll</string>
   <string name="TR_SCREENPROFILES_ACTIVE">Aktiv</string>
   <string name="TR_SCREENPROFILES_BUTTON_NEW">Ny</string>
-  <string name="TR_SCREENPROFILES_BUTTON_DELETE">Radera</string>
-  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Ta ögonblicksbild</string>
-  <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Spara ögonblicksbild</string>
-  <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Radera ögonblicksbild</string>
-  <string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Webbkamera</string>
+  <string name="TR_SCREENPROFILES_BUTTON_DELETE">Ta Bort</string>
+  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Ta bild</string>
+  <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Spara bild</string>
+  <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Ta bort bild</string>
+  <string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Webkamera</string>
   <string name="TR_SCREENO_OPTIONS">Alternativ</string>
   <string name="TR_SCREENO_BUTTON_GAME">Spel</string>
   <string name="TR_SCREENO_BUTTON_SOUND">Ljud</string>
   <string name="TR_SCREENO_BUTTON_RECORD">Inspelning</string>
   <string name="TR_SCREENO_BUTTON_VIDEO">Video</string>
-  <string name="TR_SCREENO_BUTTON_LYRICS">Låttext</string>
+  <string name="TR_SCREENO_BUTTON_LYRICS">Låt Text</string>
   <string name="TR_SCREENO_BUTTON_THEME">Tema</string>
-  <string name="TR_SCREENOGAME_BUTTON_SERVER">Serveradress</string>
-  <string name="TR_SCREENOGAME_OPTIONS">Spelalternativ</string>
+  <string name="TR_SCREENOGAME_BUTTON_SERVER">Server adress</string>
+  <string name="TR_SCREENOGAME_OPTIONS">Spel Alternativ</string>
   <string name="TR_SCREENOGAME_LANGUAGE">Språk</string>
-  <string name="TR_SCREENOGAME_DEBUGLEVEL">Felsökningsnivå</string>
-  <string name="TR_SCREENOGAME_SONGMENU">Låtmeny</string>
-  <string name="TR_SCREENOGAME_SONGSORTING">Låtsortering</string>
+  <string name="TR_SCREENOGAME_DEBUGLEVEL">Debug nivå</string>
+  <string name="TR_SCREENOGAME_SONGMENU">Låtmeny stil</string>
+  <string name="TR_SCREENOGAME_SONGSORTING">Sortering av låtar</string>
   <string name="TR_SCREENOGAME_TABS">Flikar</string>
-  <string name="TR_SCREENOGAME_DIFFICULTY">Spelets svårighetsgrad</string>
-  <string name="TR_SCREENOGAME_TIMERMODE">Timerläge</string>
-  <string name="TR_SCREENORECORD_OPTIONS">Inspelningsalternativ</string>
+  <string name="TR_SCREENOGAME_DIFFICULTY">Svårighetsgrad</string>
+  <string name="TR_SCREENOGAME_TIMERMODE">Timer läge</string>
+  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Rekord stil</string>
+  <string name="TR_SCREENORECORD_OPTIONS">Inspelnings Alternativ</string>
   <string name="TR_SCREENORECORD_DEVICE">Enhet</string>
   <string name="TR_SCREENORECORD_INPUT">Ingång</string>
   <string name="TR_SCREENORECORD_PLAYER_1">Spelare 1</string>
@@ -192,42 +195,43 @@
   <string name="TR_SCREENORECORD_PLAYER_4">Spelare 4</string>
   <string name="TR_SCREENORECORD_PLAYER_5">Spelare 5</string>
   <string name="TR_SCREENORECORD_PLAYER_6">Spelare 6</string>
-  <string name="TR_SCREENORECORD_MIC_DELAY">Mikrofonfördröjning</string>
-  <string name="TR_SCREENORECORD_MIC_WARNING">Varning: Minst en spelare är tilldelad flera mikrofoner.</string>
-  <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Fördröjningstest</string>
-  <string name="TR_SCREENOSOUND_OPTIONS">Ljudalternativ</string>
+  <string name="TR_SCREENORECORD_MIC_DELAY">Mikrofon fördröjning</string>
+  <string name="TR_SCREENORECORD_MIC_WARNING">Varning: Minst en spelare är tilldelad 2 mikrofoner.</string>
+  <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Fördröjning test</string>
+  <string name="TR_SCREENOSOUND_OPTIONS">Ljud alternativ</string>
   <string name="TR_SCREENOSOUND_BACKGROUNDMUSIC">Bakgrundsmusik</string>
-  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Volym på bakgrundsmusik</string>
-  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Källa för bakgrundsmusik</string>
-  <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Volym på förhandsvisning</string>
-  <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Volym på musik under spel</string>
-  <string name="TR_SCREENOTHEME_OPTIONS">Temaalternativ</string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Bakgrundsmusik volym</string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Bakgrundsmusik källa</string>
+  <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Förhandsvisning musik volym</string>
+  <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Spel-musik volym</string>
+  <string name="TR_SCREENOSOUND_KARAOKEEFFECT">Karaoke effekt</string>
+  <string name="TR_SCREENOTHEME_OPTIONS">Tema Alternativ</string>
   <string name="TR_SCREENOTHEME_THEME">Tema</string>
-  <string name="TR_SCREENOTHEME_SKIN">Skal</string>
+  <string name="TR_SCREENOTHEME_SKIN">Skin</string>
   <string name="TR_SCREENOTHEME_COVERTHEME">Omslagstema</string>
-  <string name="TR_SCREENOTHEME_NOTELINES">Visa notlinjer</string>
-  <string name="TR_SCREENOTHEME_TONEHELPER">Visa tonindikator</string>
-  <string name="TR_SCREENOTHEME_TIMERLOOK">Tidslinjeläge</string>
-  <string name="TR_SCREENOTHEME_FADEINFO">Tona spelarinfo</string>
-  <string name="TR_SCREENOTHEME_COVERLOADING">Omslagsladdning</string>
-  <string name="TR_SCREENOLYRICS_OPTIONS">Låttextsalternativ</string>
-  <string name="TR_SCREENOLYRICS_STYLE">Animeringsstil</string>
+  <string name="TR_SCREENOTHEME_NOTELINES">Visa not-linjer</string>
+  <string name="TR_SCREENOTHEME_TONEHELPER">Visa ton-hjälp</string>
+  <string name="TR_SCREENOTHEME_TIMERLOOK">Tidslinjesläge</string>
+  <string name="TR_SCREENOTHEME_FADEINFO">Tona ut spelar information</string>
+  <string name="TR_SCREENOTHEME_COVERLOADING">Laddning av omslagsbild </string>
+  <string name="TR_SCREENOLYRICS_OPTIONS">Låttext Alternativ</string>
+  <string name="TR_SCREENOLYRICS_STYLE">Stil på animation</string>
   <string name="TR_SCREENOLYRICS_POSITION">Textposition</string>
-  <string name="TR_SCREENOVIDEO_OPTIONS">Videoalternativ</string>
-  <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Videobakgrund</string>
-  <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Videoförhandsvisning</string>
-  <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Video under spel</string>
-  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Visa video för aktuell bakgrundsmusik</string>
-  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webbkameror</string>
-  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webbkameraupplösning</string>
-  <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Justera skärm</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Tryck CTRL + ALT (+ SHIFT) + Pilar för att justera skärmen</string>
+  <string name="TR_SCREENOVIDEO_OPTIONS">Video Alternativ</string>
+  <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Video bakgrunder</string>
+  <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Video förhandsvisning</string>
+  <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Video Samtidigt Med Låt</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Visa nuvarande bakgrunds-musik video</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webkameror</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Web-kamera upplösning</string>
+  <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Justering av skärm</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Tryck CTRL + ALT (+SHIFT) + pilar för att justera skärmen</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTRL + ALT + 0 för att återställa</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Övre vänster</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Övre höger</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Nedre vänster</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT">Nedre höger</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Överst till vänster</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Överst till höger</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Nederst till vänster</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT">Nederst till höger</string>
   <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_SCREENPSERVERQR_ADDRESS">Server adress</string>
+  <string name="TR_SCREENPSERVERQR_NOTRUNNING">Servern kan inte nås. Var god kontrollera config.xml!</string>
 </resources>
diff --git a/Output/Languages/Turkish.xml b/Output/Languages/Turkish.xml
index f7cdcb15..35594490 100644
--- a/Output/Languages/Turkish.xml
+++ b/Output/Languages/Turkish.xml
@@ -67,7 +67,7 @@
   <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
   <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Genişletilmiş</string>
   <string name="TR_CONFIG_OWN_MUSIC">Kendi Müziğiniz ve Arkaplan Müziği</string>
-  <string name="TR_CONFIG_NO_OWN_MUSIC">Hiç kendi müziğiniz yok</string>
+  <string name="TR_CONFIG_NO_OWN_MUSIC">Hiç kendi müziğiniz yok&lt;</string>
   <string name="TR_CONFIG_ONLY_OWN_MUSIC">Sadece kendi Müziğim</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_ALL">Hepsi</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Sadece isimler ve fotoğrafları</string>
@@ -124,6 +124,7 @@
   <string name="TR_SCREENSONG_ALLSONGS">Tüm Şarkılar</string>
   <string name="TR_SCREENSONG_NUMSONGS">(%v Şarkıları)</string>
   <string name="TR_SCREENSONG_NUMSONG">(%v Şarkısı)</string>
+  <string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
   <string name="TR_SCREENSING_PAUSE">Duraklat</string>
   <string name="TR_SCREENSING_BUTTON_CANCEL">Şarkı söylemeyi durdur</string>
   <string name="TR_SCREENSING_BUTTON_CONTINUE">Devam et</string>
@@ -163,7 +164,12 @@
   <string name="TR_SCREENORECORD_OPTIONS">Kaydetme Seçenekleri</string>
   <string name="TR_SCREENORECORD_DEVICE">Aygıt</string>
   <string name="TR_SCREENORECORD_INPUT">Giriş</string>
-  <string name="TR_SCREENORECORD_MIC_DELAY">Mikrofon Gecikmesi</string>
+  <string name="TR_SCREENORECORD_PLAYER_1">Oyuncu 1</string>
+  <string name="TR_SCREENORECORD_PLAYER_2">Oyuncu 2</string>
+  <string name="TR_SCREENORECORD_PLAYER_3">Oyuncu 3</string>
+  <string name="TR_SCREENORECORD_PLAYER_4">Oyuncu 4</string>
+  <string name="TR_SCREENORECORD_PLAYER_5">Oyuncu 5</string>
+  <string name="TR_SCREENORECORD_PLAYER_6">Oyuncu 6</string>
   <string name="TR_SCREENORECORD_MIC_WARNING">Uyarı: Tek oyuncuya iki mikrofon atandı.</string>
   <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Gecikme Testi</string>
   <string name="TR_SCREENOSOUND_OPTIONS">Ses Seçenekleri</string>
@@ -187,5 +193,6 @@
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Video Arka Planları</string>
   <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Video Önizleme</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Şarkı Söylerken Videoları Gösterme</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Şarkı Söylerken Videoları Gösterme</string>
   <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Ses</string>
 </resources>
diff --git a/Output/PartyModes/Challenge/Languages/Asturian.xml b/Output/PartyModes/Challenge/Languages/Asturian.xml
index 66de3f37..b87ba30f 100644
--- a/Output/PartyModes/Challenge/Languages/Asturian.xml
+++ b/Output/PartyModes/Challenge/Languages/Asturian.xml
@@ -25,5 +25,5 @@
   <string name="TR_SCREENMAIN_TABLE_GAMEPOINTS">Puntuación</string>
   <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">¿De xuru quies colar?</string>
   <string name="TR_SCREENMAIN_NEXT_PLAYER">Xugador de la ronda siguiente:</string>
-  <string name="TR_SCREENMAIN_FINISH">¡Toles rondes tan cantaes! Ya\'l ganador ye...</string>
+  <string name="TR_SCREENMAIN_FINISH">¡Toles rondes tan cantaes! Ya'l ganador ye...</string>
 </resources>
diff --git a/Output/PartyModes/ChallengeMedley/Languages/Asturian.xml b/Output/PartyModes/ChallengeMedley/Languages/Asturian.xml
index b2f17cd3..9be65cc9 100644
--- a/Output/PartyModes/ChallengeMedley/Languages/Asturian.xml
+++ b/Output/PartyModes/ChallengeMedley/Languages/Asturian.xml
@@ -28,5 +28,5 @@
   <string name="TR_SCREENMAIN_TABLE_GAMEPOINTS">Puntuación</string>
   <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">¿De xuru quies colar?</string>
   <string name="TR_SCREENMAIN_NEXT_PLAYER">Xugador de la ronda siguiente:</string>
-  <string name="TR_SCREENMAIN_FINISH">¡Toles rondes tan cantaes! Ya\'l ganador ye...</string>
+  <string name="TR_SCREENMAIN_FINISH">¡Toles rondes tan cantaes! Ya'l ganador ye...</string>
 </resources>
diff --git a/Output/PartyModes/TicTacToe/Languages/Asturian.xml b/Output/PartyModes/TicTacToe/Languages/Asturian.xml
index 206b8636..90a135b5 100644
--- a/Output/PartyModes/TicTacToe/Languages/Asturian.xml
+++ b/Output/PartyModes/TicTacToe/Languages/Asturian.xml
@@ -2,7 +2,7 @@
 <resources>
   <string name="language">Inglés</string>
   <string name="TR_PARTYMODE_NAME">Tic-Tac-Toe</string>
-  <string name="TR_PARTYMODE_DESCRIPTION">Xugar Tic-Tac-Toe d\'un mou especial</string>
+  <string name="TR_PARTYMODE_DESCRIPTION">Xugar Tic-Tac-Toe d'un mou especial</string>
   <string name="TR_BUTTON_NEXT">Siguiente</string>
   <string name="TR_BUTTON_BACK">Tornar</string>
   <string name="TR_BUTTON_START">Entamar</string>
@@ -27,6 +27,6 @@
   <string name="TR_SCREENMAIN_TEAM_CHOOSE">Esbilla un campu.</string>
   <string name="TR_SCREENMAIN_NEXT_PLAYER">Xugador siguiente</string>
   <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">¿Colar de xuru de Tic-Tac-Toe?</string>
-  <string name="TR_SCREENMAIN_WINNER">Ya\'l ganador ye...</string>
+  <string name="TR_SCREENMAIN_WINNER">Ya'l ganador ye...</string>
   <string name="TR_SCREENMAIN_NOWINNER">Nun hai ganador dalu nesta ronda...</string>
 </resources>
diff --git a/Output/PartyModes/TicTacToe/Languages/French.xml b/Output/PartyModes/TicTacToe/Languages/French.xml
index 26353af0..eba0074d 100644
--- a/Output/PartyModes/TicTacToe/Languages/French.xml
+++ b/Output/PartyModes/TicTacToe/Languages/French.xml
@@ -2,7 +2,7 @@
 <resources>
   <string name="language">Français</string>
   <string name="TR_PARTYMODE_NAME">Tic-Tac-Toe</string>
-  <string name="TR_PARTYMODE_DESCRIPTION">Jouez au Tic-Tac-Toe d\'une nouvelle façon</string>
+  <string name="TR_PARTYMODE_DESCRIPTION">Jouez au Tic-Tac-Toe d'une nouvelle façon</string>
   <string name="TR_PARTYMODE_AUDIENCE">Des matchs amusants alliant stratégie, gains et compétences</string>
   <string name="TR_BUTTON_NEXT">Suivant</string>
   <string name="TR_BUTTON_BACK">Retour</string>
@@ -17,8 +17,8 @@
   <string name="TR_CATEGORY">Catégorie</string>
   <string name="TR_ALLSONGS">Toutes les chansons</string>
   <string name="TR_SCREENCONFIG_TITLE">Tic-Tac-Toe: Configuration</string>
-  <string name="TR_SCREENCONFIG_NUMPLAYERST1">Nombre de joueurs dans l\'Equipe 1</string>
-  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Nombre de joueurs dans l\'Equipe 2</string>
+  <string name="TR_SCREENCONFIG_NUMPLAYERST1">Nombre de joueurs dans l'Equipe 1</string>
+  <string name="TR_SCREENCONFIG_NUMPLAYERST2">Nombre de joueurs dans l'Equipe 2</string>
   <string name="TR_SCREENCONFIG_NUMFIELDS">Nombre de champs</string>
   <string name="TR_SCREENCONFIG_SONGSOURCE">Source des chansons</string>
   <string name="TR_SCREENCONFIG_GAMEMODE">Mode de jeu</string>
@@ -30,5 +30,5 @@
   <string name="TR_SCREENMAIN_NEXT_PLAYER">Prochains joueurs</string>
   <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Voulez vous vraiment quitter Tic-Tac-Toe?</string>
   <string name="TR_SCREENMAIN_WINNER">Et le gagnant est...</string>
-  <string name="TR_SCREENMAIN_NOWINNER">Il n\'y a pas de gagnant sur ce tour...</string>
+  <string name="TR_SCREENMAIN_NOWINNER">Il n'y a pas de gagnant sur ce tour...</string>
 </resources>
diff --git a/Output/PartyModes/TicTacToe/Languages/Italian.xml b/Output/PartyModes/TicTacToe/Languages/Italian.xml
index b299e22a..f20d59dd 100644
--- a/Output/PartyModes/TicTacToe/Languages/Italian.xml
+++ b/Output/PartyModes/TicTacToe/Languages/Italian.xml
@@ -31,5 +31,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>
diff --git a/Vocaluxe/Website/locales/Hungarian.json b/Vocaluxe/Website/locales/Hungarian.json
new file mode 100644
index 00000000..a817b65a
--- /dev/null
+++ b/Vocaluxe/Website/locales/Hungarian.json
@@ -0,0 +1,86 @@
+{
+    "loginName": "Név:",
+    "loginPassword": "Jelszó:",
+    "loginButton": "Bejelentkezés",
+    "registerButton": "Új Profil",
+    "discoverReadQrButton": "QR-kód beolvasása",
+    "mainPageYourProfileLink": "Saját Profil",
+    "mainPageYourProfileLinkDesc": "Saját profil szerkesztése",
+    "mainPageCurrentSongLink": "Jelenlegi dal",
+    "mainPageCurrentSongLinkDesc": "Információk mutatása a jelenlegi dalról",
+    "mainPageSelectSong": "Minden dal",
+    "mainPageSelectSongDesc": "Minden elérhető dal listázása",
+    "mainPageSelectPlaylist": "Minden lejátszási lista",
+    "mainPageSelectPlaylistDesc": "Minden lejátszási lista mutatása",
+    "mainPageSelectProfile": "Profilok",
+    "mainPageSelectProfileDesc": "Minden profil mutatása",
+    "mainPageTakePhotoLink": "Fénykép készítése",
+    "mainPageTakePhotoLinkDesc": "Fényképet készít és megmutatja a kör végén",
+    "mainPageKeyboard": "Billentyűzet",
+    "mainPageKeyboardDesc": "Billentyűzet kezelése",
+    "mainPageSelectUserAdmin": "Adminisztráció",
+    "mainPageSelectUserAdminDesc": "Felhasználói jogok beállítása",
+    "mainPageLogoutLink": "Kijelentkezés",
+    "mainPageLogoutLinkDesc": "Másik profilra váltáshoz",
+    "selectProfileHeader": "Minden profil",
+    "displayProfileHeader": "Profil",
+    "displayProfileName": "Név:",
+    "displayProfilePlayerType": "Játékos Típusa",
+    "displayProfilePlayerTypeNormal": "Normál",
+    "displayProfilePlayerTypeGuest": "Vendég",
+    "displayProfilePlayerDifficulty": "Nehézségi szint",
+    "displayProfilePlayerDifficultyEasy": "Könnyű",
+    "displayProfilePlayerDifficultyNormal": "Normál",
+    "displayProfilePlayerDifficultyHard": "Nehéz",
+    "displayProfilePlayerPassword": "Új Jelszó:",
+    "displayProfilePlayerSaveButton": "Mentés",
+    "displaySongHeader": "Jelenlegi dal",
+    "displaySongArtist": "Előadó:",
+    "displaySongGenre": "Műfaj:",
+    "displaySongYear": "Év:",
+    "displaySongLanguage": "Nyelv:",
+    "displaySongIsDuet": "Duett:",
+    "popupVideoClose": "Bezárás",
+    "selectSongHeader": "Minden Dal",
+    "keyboardHeader": "Billentyűzet",
+    "keyboardButtonUp": "fel",
+    "keyboardButtonLeft": "balra",
+    "keyboardButtonRight": "jobbra",
+    "keyboardButtonDown": "le",
+    "keyboardButtonEscape": "esc",
+    "keyboardButtonTab": "tab",
+    "keyboardButtonReturn": "enter",
+    "keyboardButtonKeys": "Egyéb billentyűk küldéséhez írd ide:",
+    "selectUserAdminHeader": "Minden profil",
+    "displayUserAdminHeader": "Profil",
+    "displayUserAdminContentSaveButton": "Mentés",
+    "selectPlaylistHeader": "Lejátszási lista kiválasztása",
+    "displayPlaylistHeader": "Lejátszási lista",
+    "displayPlaylistSaveButton": "Mentés",
+    "selectPlaylistAddPlaylistButton": "Hozzáadás",
+    "Loading (external)...": "Betöltés (külső)...",
+    "Loading...": "Betöltés...",
+    "Creating...": "Elkészítés...",
+    "Error...": "Hiba...",
+    "No connection": "Nincs kapcsolat",
+    "No session": "Nincs kapcsolódás",
+    "Uploading photo...": "Fénykép feltöltése...",
+    "Getting current song...": "Jelenlegi dal betöltése...",
+    "Login...": "Bejelentkezés...",
+    "Creating profile...": "Profil létrehozása...",
+    "This is not a valid name.": "Érvénytelen név.",
+    "Uploading profile...": "Profil feltöltése...",
+    "songs": "dalok",
+    "YourName": "IdeÍrdANeved",
+    "discoverConnectHeader": "Kapcsolódás a szerverhez",
+    "discoverConnectServerAddress": "Szerver címe:",
+    "discoverConnectButton": "Kapcsolódás",
+    "Checking...": "Ellenőrzés...",
+    "timeout": "Időtúllépés",
+    "keyboardButtonShift": "Shift",
+    "keyboardButtonAlt": "Alt",
+    "keyboardButtonCtrl": "Ctrl",
+    "keyboardButtonBackspace": "Backspace",
+    "keyboardAutoSend": "Billentyűleütések automatikus küldése",
+    "keyboardButtonSend": "Küldés"
+}
\ No newline at end of file

From c899d9e7e9cf5773f6278ab8db331fbe32dd8222 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Tue, 20 Dec 2016 21:03:39 +0100
Subject: [PATCH 38/44] Speed up PitchTracker by using a template for abs
 instead of fabsf

---
 PitchTracker/ptAKF.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/PitchTracker/ptAKF.cpp b/PitchTracker/ptAKF.cpp
index 913e0cce..e8b0362e 100644
--- a/PitchTracker/ptAKF.cpp
+++ b/PitchTracker/ptAKF.cpp
@@ -24,6 +24,12 @@
 static constexpr double BaseToneFrequency = 65.4064; // lowest (half-)tone to analyze (C2 = 65.4064 Hz)
 static constexpr double HalftoneBase = 1.05946309436; // 2^(1/12) -> HalftoneBase^12 = 2 (one octave)
 
+template<typename T>
+T abs_template(T t)
+{
+	return t>0 ? t : -t;
+}
+
 int PtAKF::_InitCount = 0;
 float* restrict PtAKF::_SamplesPerPeriodPerTone = NULL;
 float* restrict PtAKF::_SamplesPerPeriodPerToneFine = NULL;
@@ -360,7 +366,7 @@ float PtAKF::_AMDFBySampleCt(float samples[_SampleCt], float samplesPerPeriodD){
 		// calc distance to corresponding sample in next period
 		float xn = samples[sampleIndex];
 		float xnt = samples[correlatingSampleIndex] * fLow + samples[correlatingSampleIndex + 1] * fHigh;
-		accumDist += abs(xn - xnt);
+		accumDist += abs_template(xn - xnt);
 	}
 
 	return accumDist / sampleIndex;

From 85ef00956ae369ddc28ad7ecc7222300ae3a0e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@gmail.com>
Date: Tue, 20 Dec 2016 21:57:54 +0100
Subject: [PATCH 39/44] Fixed some translations

---
 Output/Languages/Dutch.xml   | 2 +-
 Output/Languages/Turkish.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Output/Languages/Dutch.xml b/Output/Languages/Dutch.xml
index e6b70d3b..b05de898 100644
--- a/Output/Languages/Dutch.xml
+++ b/Output/Languages/Dutch.xml
@@ -174,7 +174,7 @@
   <string name="TR_SCREENOGAME_OPTIONS">Spelinstellingen</string>
   <string name="TR_SCREENOGAME_LANGUAGE">Taal</string>
   <string name="TR_SCREENOGAME_DEBUGLEVEL">Debug Niveau</string>
-  <string name="TR_SCREENOGAME_SONGMENU">Liedjesmenu&lt;</string>
+  <string name="TR_SCREENOGAME_SONGMENU">Liedjesmenu</string>
   <string name="TR_SCREENOGAME_SONGSORTING">Sorteren Liedjes</string>
   <string name="TR_SCREENOGAME_TABS">Tabs</string>
   <string name="TR_SCREENOGAME_DIFFICULTY">Moeilijkheidsgraad</string>
diff --git a/Output/Languages/Turkish.xml b/Output/Languages/Turkish.xml
index 35594490..91249f8a 100644
--- a/Output/Languages/Turkish.xml
+++ b/Output/Languages/Turkish.xml
@@ -67,7 +67,7 @@
   <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
   <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Genişletilmiş</string>
   <string name="TR_CONFIG_OWN_MUSIC">Kendi Müziğiniz ve Arkaplan Müziği</string>
-  <string name="TR_CONFIG_NO_OWN_MUSIC">Hiç kendi müziğiniz yok&lt;</string>
+  <string name="TR_CONFIG_NO_OWN_MUSIC">Hiç kendi müziğiniz yok</string>
   <string name="TR_CONFIG_ONLY_OWN_MUSIC">Sadece kendi Müziğim</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_ALL">Hepsi</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Sadece isimler ve fotoğrafları</string>

From c5ad1a3f95181271e080d53efbe35638700b81e5 Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Wed, 21 Dec 2016 18:14:15 +0100
Subject: [PATCH 40/44] Use ac_seek instead of ac_skipFrame to drop large
 amounts of frames(fixes #250)

---
 .../Lib/Video/Acinerella/CDecoderThread.cs    | 61 ++++++++++++++++---
 1 file changed, 51 insertions(+), 10 deletions(-)

diff --git a/Vocaluxe/Lib/Video/Acinerella/CDecoderThread.cs b/Vocaluxe/Lib/Video/Acinerella/CDecoderThread.cs
index 78707644..a11c1871 100644
--- a/Vocaluxe/Lib/Video/Acinerella/CDecoderThread.cs
+++ b/Vocaluxe/Lib/Video/Acinerella/CDecoderThread.cs
@@ -58,6 +58,7 @@ namespace Vocaluxe.Lib.Video.Acinerella
         private readonly AutoResetEvent _EvNoMoreFrames = new AutoResetEvent(false);
         private bool _IsSleeping;
         private int _WaitCount;
+        private bool _DropSeekEnabled = true; // Used to fallback to frame skipping if seek is failing once on this file
 
         public float Length { get; private set; }
         public bool Loop { get; set; }
@@ -80,6 +81,7 @@ namespace Vocaluxe.Lib.Video.Acinerella
                 var instance = (SACInstance)Marshal.PtrToStructure(_Instance, typeof(SACInstance));
                 Length = instance.Info.Duration / 1000f;
                 bool ok = instance.Opened && Length > 0.001f;
+                _DropSeekEnabled = true;
                 if (ok)
                     return true;
                 _Free();
@@ -333,6 +335,8 @@ namespace Vocaluxe.Lib.Video.Acinerella
         private void _Decode()
         {
             const int minFrameDropCount = 4;
+            // With => seekThreshold frames to drop use seek instead of skip
+            const int seekThreshold = 25; // 25 frames = 0.5 second with _FrameDuration = 0.02f
 
             if (_NoMoreFrames)
                 return;
@@ -345,17 +349,16 @@ namespace Vocaluxe.Lib.Video.Acinerella
             bool hasFrameDecoded = false;
             if (dropFrame)
             {
-                try
-                {
+                
                     var frameDropCount = (int)Math.Ceiling(timeDifference / _FrameDuration);
-                    // Add 1 dropped frame per 16 frames (Power of 2 -> Div is fast) as skipping takes time too and we don't want to skip again
-                    frameDropCount += frameDropCount / 16;
-                    hasFrameDecoded = CAcinerella.AcSkipFrames(_Instance, _Videodecoder, frameDropCount);
-                }
-                catch (Exception)
-                {
-                    CLog.LogError("Error AcSkipFrame " + _FileName);
-                }
+                    if (!_DropSeekEnabled || frameDropCount < seekThreshold)
+                    {
+                        hasFrameDecoded = _DropWithSkip(frameDropCount);
+                    }
+                    else
+                    {
+                        hasFrameDecoded = _DropWithSeek(videoTime, frameDropCount);
+                    }
             }
 
             if (!hasFrameDecoded)
@@ -383,6 +386,44 @@ namespace Vocaluxe.Lib.Video.Acinerella
             }
         }
 
+        private bool _DropWithSeek(float videoTime, int frameDropCount)
+        {
+            bool hasFrameDecoded = false;
+            try
+            {
+                hasFrameDecoded = CAcinerella.AcSeek(_Videodecoder, 0, (long)videoTime * 1000L);
+            }
+            catch (Exception)
+            {
+                CLog.LogError("Error AcSeek " + _FileName);
+            }
+
+            if (!hasFrameDecoded)
+            {
+                // Fallback to frame skipping
+                _DropSeekEnabled = false;
+                hasFrameDecoded = _DropWithSkip(frameDropCount);
+            }
+
+            return hasFrameDecoded;
+        }
+
+        private bool _DropWithSkip(int frameDropCount)
+        {
+            bool hasFrameDecoded = false;
+            // Add 1 dropped frame per 16 frames (Power of 2 -> Div is fast) as skipping takes time too and we don't want to skip again
+            frameDropCount += frameDropCount / 16;
+            try
+            {
+                hasFrameDecoded = CAcinerella.AcSkipFrames(_Instance, _Videodecoder, frameDropCount);
+            }
+            catch (Exception)
+            {
+                CLog.LogError("Error AcSkipFrame " + _FileName);
+            }
+            return hasFrameDecoded;
+        }
+
         //Copies a frame to the buffer but does not set it as 'written'
         //Returns true if frame data is now in buffer
         private bool _CopyDecodedFrameToBuffer()

From f743980fb9c68fb8eb185a720f25cb1054407af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@gmail.com>
Date: Mon, 26 Dec 2016 11:28:45 +0100
Subject: [PATCH 41/44] Language update

---
 Output/Languages/Swedish.xml | 188 +++++++++++++++++------------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/Output/Languages/Swedish.xml b/Output/Languages/Swedish.xml
index 3355da3a..b874d6e8 100644
--- a/Output/Languages/Swedish.xml
+++ b/Output/Languages/Swedish.xml
@@ -11,26 +11,26 @@
   <string name="TR_DEBUG_VIDEO_STREAMS">Videoströmmar</string>
   <string name="TR_DEBUG_TEXTURES">Texturer</string>
   <string name="TR_DEBUG_TONE_ABS">ToneAbs</string>
-  <string name="TR_DEBUG_MAX_VOLUME">Max volym</string>
-  <string name="TR_DEBUG_SONGS">Laddade sånger</string>
+  <string name="TR_DEBUG_MAX_VOLUME">Max Volym</string>
+  <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_NORMAL">Normal</string>
   <string name="TR_GAMEMODE_DUET">Duett</string>
   <string name="TR_GAMEMODE_MEDLEY">Medley</string>
   <string name="TR_GAMEMODE_SHORTSONG">Kort version</string>
-  <string name="TR_RATING_VOCAL_HERO">Vokal Hjälte</string>
+  <string name="TR_RATING_VOCAL_HERO">Sånghjälte</string>
   <string name="TR_RATING_SUPERSTAR">Superstjärna</string>
   <string name="TR_RATING_LEAD_SINGER">Frontsångare</string>
-  <string name="TR_RATING_RISING_STAR">Stigande Stjärna</string>
-  <string name="TR_RATING_HOPEFUL">Hoppfullt</string>
-  <string name="TR_RATING_WANNABE">Vill Gärna</string>
+  <string name="TR_RATING_RISING_STAR">Stigande stjärna</string>
+  <string name="TR_RATING_HOPEFUL">Hoppfull</string>
+  <string name="TR_RATING_WANNABE">Novis</string>
   <string name="TR_RATING_AMATEUR">Amatör</string>
   <string name="TR_RATING_TONE_DEAF">Tondöv</string>
   <string name="TR_USERROLE_GUEST">Gäst</string>
   <string name="TR_USERROLE_NORMAL">Normal användare</string>
   <string name="TR_USERROLE_ADMIN">Administratör</string>
-  <string name="TR_USERROLE_KEYBOARDUSER">Tangentbord användare</string>
+  <string name="TR_USERROLE_KEYBOARDUSER">Tangentbordsanvändare</string>
   <string name="TR_CONFIG_SOFTWARE">Mjukvara</string>
   <string name="TR_CONFIG_OPENGL">OpenGL</string>
   <string name="TR_CONFIG_DIRECT3D">Direct3D</string>
@@ -41,14 +41,14 @@
   <string name="TR_CONFIG_TEXTURE_HIGHEST">Högsta</string>
   <string name="TR_CONFIG_OFF">Av</string>
   <string name="TR_CONFIG_ON">På</string>
-  <string name="TR_CONFIG_ONLY_FPS">Endast FPS</string>
+  <string name="TR_CONFIG_ONLY_FPS">Endast bildfrekvens</string>
   <string name="TR_CONFIG_LEVEL1">Nivå 1</string>
   <string name="TR_CONFIG_LEVEL2">Nivå 2</string>
   <string name="TR_CONFIG_LEVEL3">Nivå 3</string>
   <string name="TR_CONFIG_LEVEL_MAX">Max</string>
   <string name="TR_CONFIG_LIST">Lista</string>
   <string name="TR_CONFIG_DREIDEL">Dreidel</string>
-  <string name="TR_CONFIG_TILE_BOARD">Brickor</string>
+  <string name="TR_CONFIG_TILE_BOARD">Rutnät</string>
   <string name="TR_CONFIG_BOOK">Bok</string>
   <string name="TR_CONFIG_COVERLOADING_ONDEMAND">På begäran</string>
   <string name="TR_CONFIG_COVERLOADING_ATSTART">Vid uppstart</string>
@@ -59,18 +59,18 @@
   <string name="TR_CONFIG_ARTIST">Artist</string>
   <string name="TR_CONFIG_ARTIST_LETTER">Artist efter bokstav</string>
   <string name="TR_CONFIG_TITLE_LETTER">Titel efter bokstav</string>
-  <string name="TR_CONFIG_EDITION">Edition</string>
+  <string name="TR_CONFIG_EDITION">Utgåva</string>
   <string name="TR_CONFIG_GENRE">Genre</string>
   <string name="TR_CONFIG_YEAR">År</string>
   <string name="TR_CONFIG_DECADE">Årtionde</string>
   <string name="TR_CONFIG_LANGUAGE">Språk</string>
   <string name="TR_CONFIG_DATEADDED">Tillagd datum</string>
   <string name="TR_CONFIG_EASY">Lätt</string>
-  <string name="TR_CONFIG_NORMAL">Normalt</string>
-  <string name="TR_CONFIG_HARD">Svårt</string>
-  <string name="TR_CONFIG_TIMERMODE_CURRENT">Nuvarande</string>
+  <string name="TR_CONFIG_NORMAL">Medel</string>
+  <string name="TR_CONFIG_HARD">Svår</string>
+  <string name="TR_CONFIG_TIMERMODE_CURRENT">Aktuell</string>
   <string name="TR_CONFIG_TIMERMODE_REMAINING">Återstående</string>
-  <string name="TR_CONFIG_TIMERMODE_TOTAL">Totalt</string>
+  <string name="TR_CONFIG_TIMERMODE_TOTAL">Total</string>
   <string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
   <string name="TR_CONFIG_TIMERLOOK_EXPANDED">Utvidgad</string>
   <string name="TR_CONFIG_HIGHSCORE_LIST_ALL">Lista alla</string>
@@ -84,7 +84,7 @@
   <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Ingenting</string>
   <string name="TR_CONFIG_LYRICSTYLE_FILL">Fyll</string>
   <string name="TR_CONFIG_LYRICSTYLE_JUMP">Hoppa</string>
-  <string name="TR_CONFIG_LYRICSTYLE_SLIDE">Skjut</string>
+  <string name="TR_CONFIG_LYRICSTYLE_SLIDE">Svep</string>
   <string name="TR_CONFIG_LYRICSTYLE_ZOOM">Zooma</string>
   <string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Nederst</string>
   <string name="TR_CONFIG_LYRICSPOSITION_TOP">Överst</string>
@@ -93,100 +93,100 @@
   <string name="TR_SCREENLOAD_LOADING">Laddar</string>
   <string name="TR_SCREENLOAD_TOTAL">Totalt</string>
   <string name="TR_SCREENLOAD_SONGS">låtar</string>
-  <string name="TR_SCREENLOAD_LOADED">Laddad</string>
-  <string name="TR_SCREENMAIN_MENU">Huvud Meny</string>
+  <string name="TR_SCREENLOAD_LOADED">laddat</string>
+  <string name="TR_SCREENMAIN_MENU">Huvudmeny</string>
   <string name="TR_SCREENMAIN_BUTTON_SING">Sjung</string>
   <string name="TR_SCREENMAIN_BUTTON_PARTY">Party</string>
   <string name="TR_SCREENMAIN_BUTTON_OPTIONS">Alternativ</string>
   <string name="TR_SCREENMAIN_BUTTON_PROFILES">Profiler</string>
   <string name="TR_SCREENMAIN_TEXT_NOPROFILES">Inga profiler funna!</string>
-  <string name="TR_SCREENPARTY_TITLE">Party-lägesval</string>
-  <string name="TR_SCREENPARTY_MODES">Party-läge</string>
+  <string name="TR_SCREENPARTY_TITLE">Val av partyläge</string>
+  <string name="TR_SCREENPARTY_MODES">Partyläge</string>
   <string name="TR_SCREENPARTY_DESCRIPTION">Beskrivning</string>
-  <string name="TR_SCREENPARTY_AUTHOR">Författare</string>
+  <string name="TR_SCREENPARTY_AUTHOR">Skapare</string>
   <string name="TR_SCREENPARTY_VERSION">Version</string>
-  <string name="TR_SCREENPARTY_ERROR">kan ej ladda detta party läge</string>
+  <string name="TR_SCREENPARTY_ERROR">Kan ej ladda detta partyläge</string>
   <string name="TR_SCREENPARTY_ERROR_MICS">Det finns inga mikrofoner konfigurerade!</string>
-  <string name="TR_SCREENPARTY_ERROR_MIC_NUM">%d mikrofoner krävs för denna party-mode!</string>
-  <string name="TR_SCREENPARTY_TARGETAUDIENCE">Mål publik</string>
+  <string name="TR_SCREENPARTY_ERROR_MIC_NUM">%d mikrofoner krävs för denna partyläge!</string>
+  <string name="TR_SCREENPARTY_TARGETAUDIENCE">Målgrupp</string>
   <string name="TR_SCREENPARTY_NOTEAMS">Inga lag</string>
   <string name="TR_SCREENPARTY_NUMTEAMS">Antal lag</string>
   <string name="TR_SCREENPARTY_NUMPLAYERS">Antal spelare</string>
-  <string name="TR_SCREENNAMES_MENU">Spelarväljare</string>
+  <string name="TR_SCREENNAMES_MENU">Val av spelare</string>
   <string name="TR_SCREENNAMES_PLAYER">Spelare</string>
-  <string name="TR_SCREENNAMES_1PLAYER">1 Spelare</string>
-  <string name="TR_SCREENNAMES_2PLAYER">2 Spelare</string>
-  <string name="TR_SCREENNAMES_3PLAYER">3 Spelare</string>
-  <string name="TR_SCREENNAMES_4PLAYER">4 Spelare</string>
-  <string name="TR_SCREENNAMES_5PLAYER">5 Spelare</string>
-  <string name="TR_SCREENNAMES_6PLAYER">6 Spelare</string>
-  <string name="TR_SCREENNAMES_WARNING_MICS_SG">Varning: Det finns ingen Mic tilldelad Spelare %v!</string>
-  <string name="TR_SCREENNAMES_WARNING_MICS_PL">Varning: Det finns ingen Micar tilldelad Spelarna %v!</string>
+  <string name="TR_SCREENNAMES_1PLAYER">1 spelare</string>
+  <string name="TR_SCREENNAMES_2PLAYER">2 spelare</string>
+  <string name="TR_SCREENNAMES_3PLAYER">3 spelare</string>
+  <string name="TR_SCREENNAMES_4PLAYER">4 spelare</string>
+  <string name="TR_SCREENNAMES_5PLAYER">5 spelare</string>
+  <string name="TR_SCREENNAMES_6PLAYER">6 spelare</string>
+  <string name="TR_SCREENNAMES_WARNING_MICS_SG">Varning: Det finns ingen mikrofon tilldelad spelare %v!</string>
+  <string name="TR_SCREENNAMES_WARNING_MICS_PL">Varning: Det finns inga mikrofoner tilldelade spelare %v!</string>
   <string name="TR_SCREENNAMES_WARNING_PROFILES_SG">Varning: Det finns ingen profil för spelare %v!</string>
   <string name="TR_SCREENNAMES_WARNING_PROFILES_PL">Varning: Det finns inga profiler för spelare %v!</string>
   <string name="TR_SCREENSONG_MENU">Låtval</string>
   <string name="TR_SCREENSONG_BUTTON_SING">Sjung</string>
-  <string name="TR_SCREENSONG_BUTTON_PLAYLIST">Lägg till Spellista</string>
+  <string name="TR_SCREENSONG_BUTTON_PLAYLIST">Lägg till spellista</string>
   <string name="TR_SCREENSONG_BUTTON_CANCEL">Stäng</string>
   <string name="TR_SCREENSONG_BUTTON_RANDOM">Välj slumpmässig låt</string>
-  <string name="TR_SCREENSONG_BUTTON_RANDOMCAT">Välg slumpmässig kategori</string>
+  <string name="TR_SCREENSONG_BUTTON_RANDOMCAT">Välj slumpmässig kategori</string>
   <string name="TR_SCREENSONG_BUTTON_SINGALL">Sjung alla låtar</string>
   <string name="TR_SCREENSONG_BUTTON_SINGALLVISIBLE">Sjung alla synliga låtar</string>
   <string name="TR_SCREENSONG_BUTTON_OPENPLAYLIST">Öppna spellista</string>
   <string name="TR_SCREENSONG_BUTTON_OPEN_SELECTED_ITEM">Välj</string>
   <string name="TR_SCREENSONG_BUTTON_RANDOMMEDLEY">Sjung slumpmässig medley</string>
-  <string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Sjung medley-låt</string>
-  <string name="TR_SCREENSONG_NEWPLAYLIST">Ny Spellista</string>
-  <string name="TR_SCREENSONG_SONGOPTIONS">Låt Alternativ</string>
+  <string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Sjung medleylåt</string>
+  <string name="TR_SCREENSONG_NEWPLAYLIST">Ny spellista</string>
+  <string name="TR_SCREENSONG_SONGOPTIONS">Låtalternativ</string>
   <string name="TR_SCREENSONG_SEARCH">Sök:</string>
   <string name="TR_SCREENSONG_NOLANGUAGE">Inget språk</string>
-  <string name="TR_SCREENSONG_NOYEAR">Inget År</string>
-  <string name="TR_SCREENSONG_NOGENRE">Ingen Genre</string>
-  <string name="TR_SCREENSONG_NOEDITION">Ingen Edition</string>
-  <string name="TR_SCREENSONG_ALLSONGS">Alla Låtar</string>
+  <string name="TR_SCREENSONG_NOYEAR">Inget år</string>
+  <string name="TR_SCREENSONG_NOGENRE">Ingen genre</string>
+  <string name="TR_SCREENSONG_NOEDITION">Ingen utgåva</string>
+  <string name="TR_SCREENSONG_ALLSONGS">Alla låtar</string>
   <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_SCREENSING_PAUSE">Paus</string>
-  <string name="TR_SCREENSING_BUTTON_CANCEL">Stoppa Låt</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_SKIP">Hoppa över låt</string>
   <string name="TR_SCREENSCORE_SCORES">Resultat</string>
   <string name="TR_SCREENSCORE_RATING">Rankning</string>
   <string name="TR_SCREENSCORE_POINTS">Poäng</string>
   <string name="TR_SCREENSCORE_GAMEDIFFICULTY">Svårighetsgrad</string>
   <string name="TR_SCREENSCORE_OVERALLSCORE">Totalpoäng</string>
-  <string name="TR_SCREENHIGHSCORE_HIGHSCORE">Highscore</string>
+  <string name="TR_SCREENHIGHSCORE_HIGHSCORE">Topplista</string>
   <string name="TR_SCREENPROFILES_PROFILES">Profiler</string>
-  <string name="TR_SCREENPROFILES_PLAYERNAME">Spelarens namn</string>
+  <string name="TR_SCREENPROFILES_PLAYERNAME">Spelarnamn</string>
   <string name="TR_SCREENPROFILES_GAMEDIFFICULTY">Svårighetsgrad</string>
-  <string name="TR_SCREENPROFILES_AVATAR">Avatar</string>
-  <string name="TR_SCREENPROFILES_USERROLE">Användares roll</string>
+  <string name="TR_SCREENPROFILES_AVATAR">Profilbild</string>
+  <string name="TR_SCREENPROFILES_USERROLE">Användarroll</string>
   <string name="TR_SCREENPROFILES_ACTIVE">Aktiv</string>
   <string name="TR_SCREENPROFILES_BUTTON_NEW">Ny</string>
-  <string name="TR_SCREENPROFILES_BUTTON_DELETE">Ta Bort</string>
-  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Ta bild</string>
-  <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Spara bild</string>
-  <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Ta bort bild</string>
-  <string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Webkamera</string>
+  <string name="TR_SCREENPROFILES_BUTTON_DELETE">Radera</string>
+  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Ta ögonblicksbild</string>
+  <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Spara ögonblicksbild</string>
+  <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Radera ögonblicksbild</string>
+  <string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Webbkamera</string>
   <string name="TR_SCREENO_OPTIONS">Alternativ</string>
   <string name="TR_SCREENO_BUTTON_GAME">Spel</string>
   <string name="TR_SCREENO_BUTTON_SOUND">Ljud</string>
   <string name="TR_SCREENO_BUTTON_RECORD">Inspelning</string>
   <string name="TR_SCREENO_BUTTON_VIDEO">Video</string>
-  <string name="TR_SCREENO_BUTTON_LYRICS">Låt Text</string>
+  <string name="TR_SCREENO_BUTTON_LYRICS">Låttext</string>
   <string name="TR_SCREENO_BUTTON_THEME">Tema</string>
-  <string name="TR_SCREENOGAME_BUTTON_SERVER">Server adress</string>
-  <string name="TR_SCREENOGAME_OPTIONS">Spel Alternativ</string>
+  <string name="TR_SCREENOGAME_BUTTON_SERVER">Serveradress</string>
+  <string name="TR_SCREENOGAME_OPTIONS">Spelalternativ</string>
   <string name="TR_SCREENOGAME_LANGUAGE">Språk</string>
-  <string name="TR_SCREENOGAME_DEBUGLEVEL">Debug nivå</string>
-  <string name="TR_SCREENOGAME_SONGMENU">Låtmeny stil</string>
-  <string name="TR_SCREENOGAME_SONGSORTING">Sortering av låtar</string>
+  <string name="TR_SCREENOGAME_DEBUGLEVEL">Felsökningsnivå</string>
+  <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_DIFFICULTY">Svårighetsgrad</string>
-  <string name="TR_SCREENOGAME_TIMERMODE">Timer läge</string>
-  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Rekord stil</string>
-  <string name="TR_SCREENORECORD_OPTIONS">Inspelnings Alternativ</string>
+  <string name="TR_SCREENOGAME_DIFFICULTY">Spelets svårighetsgrad</string>
+  <string name="TR_SCREENOGAME_TIMERMODE">Timerläge</string>
+  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Topplistestil</string>
+  <string name="TR_SCREENORECORD_OPTIONS">Inspelningsalternativ</string>
   <string name="TR_SCREENORECORD_DEVICE">Enhet</string>
   <string name="TR_SCREENORECORD_INPUT">Ingång</string>
   <string name="TR_SCREENORECORD_PLAYER_1">Spelare 1</string>
@@ -195,43 +195,43 @@
   <string name="TR_SCREENORECORD_PLAYER_4">Spelare 4</string>
   <string name="TR_SCREENORECORD_PLAYER_5">Spelare 5</string>
   <string name="TR_SCREENORECORD_PLAYER_6">Spelare 6</string>
-  <string name="TR_SCREENORECORD_MIC_DELAY">Mikrofon fördröjning</string>
-  <string name="TR_SCREENORECORD_MIC_WARNING">Varning: Minst en spelare är tilldelad 2 mikrofoner.</string>
-  <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Fördröjning test</string>
-  <string name="TR_SCREENOSOUND_OPTIONS">Ljud alternativ</string>
+  <string name="TR_SCREENORECORD_MIC_DELAY">Mikrofonfördröjning</string>
+  <string name="TR_SCREENORECORD_MIC_WARNING">Varning: Minst en spelare är tilldelad flera mikrofoner.</string>
+  <string name="TR_SCREENORECORD_BUTTON_DELAYTEST">Fördröjningstest</string>
+  <string name="TR_SCREENOSOUND_OPTIONS">Ljudalternativ</string>
   <string name="TR_SCREENOSOUND_BACKGROUNDMUSIC">Bakgrundsmusik</string>
-  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Bakgrundsmusik volym</string>
-  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Bakgrundsmusik källa</string>
-  <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Förhandsvisning musik volym</string>
-  <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Spel-musik volym</string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME">Volym på bakgrundsmusik</string>
+  <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Källa för bakgrundsmusik</string>
+  <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Volym på förhandsvisning</string>
+  <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Volym på musik under spel</string>
   <string name="TR_SCREENOSOUND_KARAOKEEFFECT">Karaoke effekt</string>
-  <string name="TR_SCREENOTHEME_OPTIONS">Tema Alternativ</string>
+  <string name="TR_SCREENOTHEME_OPTIONS">Temaalternativ</string>
   <string name="TR_SCREENOTHEME_THEME">Tema</string>
-  <string name="TR_SCREENOTHEME_SKIN">Skin</string>
+  <string name="TR_SCREENOTHEME_SKIN">Skal</string>
   <string name="TR_SCREENOTHEME_COVERTHEME">Omslagstema</string>
-  <string name="TR_SCREENOTHEME_NOTELINES">Visa not-linjer</string>
-  <string name="TR_SCREENOTHEME_TONEHELPER">Visa ton-hjälp</string>
-  <string name="TR_SCREENOTHEME_TIMERLOOK">Tidslinjesläge</string>
-  <string name="TR_SCREENOTHEME_FADEINFO">Tona ut spelar information</string>
-  <string name="TR_SCREENOTHEME_COVERLOADING">Laddning av omslagsbild </string>
-  <string name="TR_SCREENOLYRICS_OPTIONS">Låttext Alternativ</string>
-  <string name="TR_SCREENOLYRICS_STYLE">Stil på animation</string>
+  <string name="TR_SCREENOTHEME_NOTELINES">Visa notlinjer</string>
+  <string name="TR_SCREENOTHEME_TONEHELPER">Visa tonindikator</string>
+  <string name="TR_SCREENOTHEME_TIMERLOOK">Tidslinjeläge</string>
+  <string name="TR_SCREENOTHEME_FADEINFO">Tona spelarinfo</string>
+  <string name="TR_SCREENOTHEME_COVERLOADING">Omslagsladdning</string>
+  <string name="TR_SCREENOLYRICS_OPTIONS">Låttextsalternativ</string>
+  <string name="TR_SCREENOLYRICS_STYLE">Animeringsstil</string>
   <string name="TR_SCREENOLYRICS_POSITION">Textposition</string>
-  <string name="TR_SCREENOVIDEO_OPTIONS">Video Alternativ</string>
-  <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Video bakgrunder</string>
-  <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Video förhandsvisning</string>
-  <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Video Samtidigt Med Låt</string>
-  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Visa nuvarande bakgrunds-musik video</string>
-  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webkameror</string>
-  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Web-kamera upplösning</string>
-  <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Justering av skärm</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Tryck CTRL + ALT (+SHIFT) + pilar för att justera skärmen</string>
+  <string name="TR_SCREENOVIDEO_OPTIONS">Videoalternativ</string>
+  <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Videobakgrund</string>
+  <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Videoförhandsvisning</string>
+  <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Video under spel</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Visa video för aktuell bakgrundsmusik</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webbkameror</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webbkameraupplösning</string>
+  <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Justera skärm</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Tryck CTRL + ALT (+ SHIFT) + Pilar för att justera skärmen</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTRL + ALT + 0 för att återställa</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Överst till vänster</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Överst till höger</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Nederst till vänster</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT">Nederst till höger</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Övre vänster</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Övre höger</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Nedre vänster</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT">Nedre höger</string>
   <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Volym</string>
-  <string name="TR_SCREENPSERVERQR_ADDRESS">Server adress</string>
-  <string name="TR_SCREENPSERVERQR_NOTRUNNING">Servern kan inte nås. Var god kontrollera config.xml!</string>
+  <string name="TR_SCREENPSERVERQR_ADDRESS">Serveradress</string>
+  <string name="TR_SCREENPSERVERQR_NOTRUNNING">Servern körs inte. Var god kontrollera config.xml!</string>
 </resources>

From 795c8705c4eebd7b766f6401b7e1309919bc461a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@gmail.com>
Date: Mon, 26 Dec 2016 11:51:04 +0100
Subject: [PATCH 42/44] Updated Swedish.xml

---
 Output/Languages/Swedish.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Output/Languages/Swedish.xml b/Output/Languages/Swedish.xml
index b874d6e8..673f66f1 100644
--- a/Output/Languages/Swedish.xml
+++ b/Output/Languages/Swedish.xml
@@ -11,7 +11,7 @@
   <string name="TR_DEBUG_VIDEO_STREAMS">Videoströmmar</string>
   <string name="TR_DEBUG_TEXTURES">Texturer</string>
   <string name="TR_DEBUG_TONE_ABS">ToneAbs</string>
-  <string name="TR_DEBUG_MAX_VOLUME">Max Volym</string>
+  <string name="TR_DEBUG_MAX_VOLUME">Maxvolym</string>
   <string name="TR_DEBUG_SONGS">Laddade låtar</string>
   <string name="TR_DEBUG_MOUSE">Mus</string>
   <string name="TR_DEBUG_MEMORY">Minnesanvändning</string>
@@ -79,8 +79,8 @@
   <string name="TR_CONFIG_NO_OWN_MUSIC">Ingen egen musik</string>
   <string name="TR_CONFIG_ONLY_OWN_MUSIC">Endast egen musik</string>
   <string name="TR_CONFIG_ONLY_SONG">Endast vald låt</string>
-  <string name="TR_CONFIG_FADEPLAYERINFO_ALL">Alla</string>
-  <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Endast namn och avatarer</string>
+  <string name="TR_CONFIG_FADEPLAYERINFO_ALL">Allt</string>
+  <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Endast namn och profilbilder</string>
   <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Ingenting</string>
   <string name="TR_CONFIG_LYRICSTYLE_FILL">Fyll</string>
   <string name="TR_CONFIG_LYRICSTYLE_JUMP">Hoppa</string>
@@ -165,9 +165,9 @@
   <string name="TR_SCREENPROFILES_ACTIVE">Aktiv</string>
   <string name="TR_SCREENPROFILES_BUTTON_NEW">Ny</string>
   <string name="TR_SCREENPROFILES_BUTTON_DELETE">Radera</string>
-  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Ta ögonblicksbild</string>
-  <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Spara ögonblicksbild</string>
-  <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Radera ögonblicksbild</string>
+  <string name="TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT">Ta bild</string>
+  <string name="TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT">Spara bild</string>
+  <string name="TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT">Radera bild</string>
   <string name="TR_SCREENPROFILES_BUTTON_WEBCAM">Webbkamera</string>
   <string name="TR_SCREENO_OPTIONS">Alternativ</string>
   <string name="TR_SCREENO_BUTTON_GAME">Spel</string>
@@ -185,7 +185,7 @@
   <string name="TR_SCREENOGAME_TABS">Flikar</string>
   <string name="TR_SCREENOGAME_DIFFICULTY">Spelets svårighetsgrad</string>
   <string name="TR_SCREENOGAME_TIMERMODE">Timerläge</string>
-  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Topplistestil</string>
+  <string name="TR_SCREENOGAME_HIGHSCORESTYLE">Topplistsvy</string>
   <string name="TR_SCREENORECORD_OPTIONS">Inspelningsalternativ</string>
   <string name="TR_SCREENORECORD_DEVICE">Enhet</string>
   <string name="TR_SCREENORECORD_INPUT">Ingång</string>
@@ -204,7 +204,7 @@
   <string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Källa för bakgrundsmusik</string>
   <string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Volym på förhandsvisning</string>
   <string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Volym på musik under spel</string>
-  <string name="TR_SCREENOSOUND_KARAOKEEFFECT">Karaoke effekt</string>
+  <string name="TR_SCREENOSOUND_KARAOKEEFFECT">Karaokeeffekt</string>
   <string name="TR_SCREENOTHEME_OPTIONS">Temaalternativ</string>
   <string name="TR_SCREENOTHEME_THEME">Tema</string>
   <string name="TR_SCREENOTHEME_SKIN">Skal</string>

From ab50362496c1862b67916b211d5d4979daa42d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@gmail.com>
Date: Mon, 26 Dec 2016 12:04:35 +0100
Subject: [PATCH 43/44] Updated translators on credits-screen

---
 Vocaluxe/Screens/CScreenCredits.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Vocaluxe/Screens/CScreenCredits.cs b/Vocaluxe/Screens/CScreenCredits.cs
index f3e8c332..9ec2afed 100644
--- a/Vocaluxe/Screens/CScreenCredits.cs
+++ b/Vocaluxe/Screens/CScreenCredits.cs
@@ -428,12 +428,12 @@ namespace Vocaluxe.Screens
             CCreditTranslation asturian = _AddNewTranslation("Asturian", new List<string> { "Puxarra" });
             CCreditTranslation czech = _AddNewTranslation("Czech", new List<string> { "fri" });
             CCreditTranslation dutch = _AddNewTranslation("Dutch", new List<string> { "thijsblaauw", "DeMarin" });
-            CCreditTranslation french = _AddNewTranslation("French", new List<string> { "pinky007" });
-            CCreditTranslation hungarian = _AddNewTranslation("Hungarian", new List<string> { "warez" });
-            CCreditTranslation italian = _AddNewTranslation("Italian", new List<string> { "giuseppep", "LFactory" });
+            CCreditTranslation french = _AddNewTranslation("French", new List<string> { "pinky007", "javafrog" });
+            CCreditTranslation hungarian = _AddNewTranslation("Hungarian", new List<string> { "warez", "skyli" });
+            CCreditTranslation italian = _AddNewTranslation("Italian", new List<string> { "giuseppep", "LFactory", "yogotosleepnow" });
             CCreditTranslation portugese = _AddNewTranslation("Portuguese", new List<string> { "2borG", "xventil" });
             CCreditTranslation spanish = _AddNewTranslation("Spanish", new List<string> { "Pantero03", "RubenDjOn", "TeLiX", "karv" });
-            CCreditTranslation swedish = _AddNewTranslation("Swedish", new List<string> { "u28151" });
+            CCreditTranslation swedish = _AddNewTranslation("Swedish", new List<string> { "u28151", "Jiiniasu" });
             CCreditTranslation turkish = _AddNewTranslation("Turkish", new List<string> { "spirax", "Swertyy" });
 
             _Translations = new List<CCreditTranslation> { intro, asturian, czech, dutch, french, hungarian, italian, spanish, swedish, turkish };

From 6bb67f218a9a69d41640b786381cb29d51700186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@gmail.com>
Date: Mon, 26 Dec 2016 22:45:49 +0100
Subject: [PATCH 44/44] Updatet swedish files

---
 .../Challenge/Languages/Swedish.xml           | 20 ++++-----
 .../ChallengeMedley/Languages/Swedish.xml     | 24 +++++------
 .../TicTacToe/Languages/Swedish.xml           |  9 ++--
 Vocaluxe/Website/locales/sv.json              | 42 +++++++++----------
 4 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/Output/PartyModes/Challenge/Languages/Swedish.xml b/Output/PartyModes/Challenge/Languages/Swedish.xml
index a4f19260..f47c0fb6 100644
--- a/Output/PartyModes/Challenge/Languages/Swedish.xml
+++ b/Output/PartyModes/Challenge/Languages/Swedish.xml
@@ -2,7 +2,7 @@
 <resources>
   <string name="language">Svenska</string>
   <string name="TR_PARTYMODE_NAME">Utmanarläge</string>
-  <string name="TR_PARTYMODE_DESCRIPTION">Spela några utmanar-omgångar.</string>
+  <string name="TR_PARTYMODE_DESCRIPTION">Spela några utmanaromgångar.</string>
   <string name="TR_PARTYMODE_AUDIENCE">För alla som är intresserade av dueller.</string>
   <string name="TR_BUTTON_NEXT">Nästa</string>
   <string name="TR_BUTTON_BACK">Tillbaka</string>
@@ -10,23 +10,23 @@
   <string name="TR_BUTTON_EXIT">Avsluta</string>
   <string name="TR_BUTTON_YES">Ja</string>
   <string name="TR_BUTTON_NO">Nej</string>
-  <string name="TR_BUTTON_NEXT_ROUND">Nästa Omgång</string>
+  <string name="TR_BUTTON_NEXT_ROUND">Nästa omgång</string>
   <string name="TR_SCREENCONFIG_TITLE">Utmanarläge: Konfiguration</string>
   <string name="TR_SCREENCONFIG_NUMPLAYERS">Antal spelare</string>
   <string name="TR_SCREENCONFIG_NUMMICS">Antal mikrofoner</string>
   <string name="TR_SCREENCONFIG_NUMROUNDS">Antal omgångar</string>
-  <string name="TR_SCREENCONFIG_NUMJOKERS">Antal joker</string>
-  <string name="TR_SCREENCONFIG_REFILLJOKERS">Fyll på jokers varje runda</string>
-  <string name="TR_SCREENNAMES_TITLE">Utmanarläge: Välj Spelare</string>
-  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Välj slumpmässig</string>
+  <string name="TR_SCREENCONFIG_NUMJOKERS">Antal jokrar</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Fyll på jokrar varje runda</string>
+  <string name="TR_SCREENNAMES_TITLE">Utmanarläge: Välj spelare</string>
+  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Välj slumpmässiga</string>
   <string name="TR_SCREENMAIN_TITLE">Utmanarläge: Översikt</string>
-  <string name="TR_SCREENMAIN_TABLE_POS">Position</string>
+  <string name="TR_SCREENMAIN_TABLE_POS">Pos</string>
   <string name="TR_SCREENMAIN_TABLE_PLAYERNAME">Namn</string>
   <string name="TR_SCREENMAIN_TABLE_NUMPLAYED">Omgångar</string>
   <string name="TR_SCREENMAIN_TABLE_WON">Vunna</string>
-  <string name="TR_SCREENMAIN_TABLE_SINGPOINTS">Sång Poäng</string>
-  <string name="TR_SCREENMAIN_TABLE_GAMEPOINTS">Resultat</string>
-  <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Vill Du verkligen avsluta?</string>
+  <string name="TR_SCREENMAIN_TABLE_SINGPOINTS">Sångpoäng</string>
+  <string name="TR_SCREENMAIN_TABLE_GAMEPOINTS">Poäng</string>
+  <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Vill du verkligen avsluta?</string>
   <string name="TR_SCREENMAIN_NEXT_PLAYER">Spelare i nästa omgång:</string>
   <string name="TR_SCREENMAIN_FINISH">Alla omgånga sjungna! Och vinnaren är...</string>
 </resources>
diff --git a/Output/PartyModes/ChallengeMedley/Languages/Swedish.xml b/Output/PartyModes/ChallengeMedley/Languages/Swedish.xml
index ca654d47..c447ee66 100644
--- a/Output/PartyModes/ChallengeMedley/Languages/Swedish.xml
+++ b/Output/PartyModes/ChallengeMedley/Languages/Swedish.xml
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="language">Svenska</string>
-  <string name="TR_PARTYMODE_NAME">Utmanar Medley Läge</string>
-  <string name="TR_PARTYMODE_DESCRIPTION">Spela några utmanaromgångar, använd endast Medleys</string>
-  <string name="TR_PARTYMODE_AUDIENCE">För alla som är intresserade av dueller och Medleys.</string>
+  <string name="TR_PARTYMODE_NAME">Medleyutmanarläge</string>
+  <string name="TR_PARTYMODE_DESCRIPTION">Spela några utmanaromgångar med endast medleys.</string>
+  <string name="TR_PARTYMODE_AUDIENCE">För alla som är intresserade av dueller och medleys.</string>
   <string name="TR_BUTTON_NEXT">Nästa</string>
   <string name="TR_BUTTON_BACK">Tillbaka</string>
   <string name="TR_BUTTON_START">Starta</string>
   <string name="TR_BUTTON_EXIT">Avsluta</string>
   <string name="TR_BUTTON_YES">Ja</string>
   <string name="TR_BUTTON_NO">Nej</string>
-  <string name="TR_BUTTON_NEXT_ROUND">Nästa Omgång</string>
+  <string name="TR_BUTTON_NEXT_ROUND">Nästa omgång</string>
   <string name="TR_PLAYLIST">Spellista</string>
   <string name="TR_CATEGORY">Kategori</string>
   <string name="TR_ALLSONGS">Alla låtar</string>
   <string name="TR_SONGS">Låtar</string>
-  <string name="TR_SCREENCONFIG_TITLE">Utamanr Medley Läge: Konfiguration</string>
+  <string name="TR_SCREENCONFIG_TITLE">Medleyutmanarläge: Konfiguration</string>
   <string name="TR_SCREENCONFIG_NUMPLAYERS">Antal spelare</string>
   <string name="TR_SCREENCONFIG_NUMMICS">Antal mikrofoner</string>
   <string name="TR_SCREENCONFIG_NUMROUNDS">Antal omgångar</string>
   <string name="TR_SCREENCONFIG_NUMSONGS">Antal låtar per omgång</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Låt källa</string>
-  <string name="TR_SCREENNAMES_TITLE">Utmanar Medley Läge: Välj Spelare</string>
-  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Välj slumpmässig</string>
-  <string name="TR_SCREENMAIN_TITLE">Utmanar Medley Läge: Översikt</string>
-  <string name="TR_SCREENMAIN_TABLE_POS">Position</string>
+  <string name="TR_SCREENCONFIG_SONGSOURCE">Låtkälla</string>
+  <string name="TR_SCREENNAMES_TITLE">Medleyutmanarläge: Välj Spelare</string>
+  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Välj slumpmässiga</string>
+  <string name="TR_SCREENMAIN_TITLE">Medleyutmanarläge: Översikt</string>
+  <string name="TR_SCREENMAIN_TABLE_POS">Pos</string>
   <string name="TR_SCREENMAIN_TABLE_PLAYERNAME">Namn</string>
   <string name="TR_SCREENMAIN_TABLE_NUMPLAYED">Omgångar</string>
   <string name="TR_SCREENMAIN_TABLE_WON">Vunna</string>
-  <string name="TR_SCREENMAIN_TABLE_SINGPOINTS">Sång Poäng</string>
-  <string name="TR_SCREENMAIN_TABLE_GAMEPOINTS">Resultat</string>
+  <string name="TR_SCREENMAIN_TABLE_SINGPOINTS">Sångpoäng</string>
+  <string name="TR_SCREENMAIN_TABLE_GAMEPOINTS">Poäng</string>
   <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Vill du verkligen avsluta?</string>
   <string name="TR_SCREENMAIN_NEXT_PLAYER">Spelare i nästa omgång:</string>
   <string name="TR_SCREENMAIN_FINISH">Alla omgångar sjungna! Och vinnaren är...</string>
diff --git a/Output/PartyModes/TicTacToe/Languages/Swedish.xml b/Output/PartyModes/TicTacToe/Languages/Swedish.xml
index ed08496a..259bbe71 100644
--- a/Output/PartyModes/TicTacToe/Languages/Swedish.xml
+++ b/Output/PartyModes/TicTacToe/Languages/Swedish.xml
@@ -20,15 +20,16 @@
   <string name="TR_SCREENCONFIG_NUMPLAYERST1">Antal spelare i lag 1</string>
   <string name="TR_SCREENCONFIG_NUMPLAYERST2">Antal spelare i lag 2</string>
   <string name="TR_SCREENCONFIG_NUMFIELDS">Antal fält</string>
-  <string name="TR_SCREENCONFIG_SONGSOURCE">Sång källa</string>
-  <string name="TR_SCREENCONFIG_GAMEMODE">Spel Läge</string>
-  <string name="TR_SCREENNAMES_TITLE">Tripp-Trapp-Trull: Välj Spelare</string>
+  <string name="TR_SCREENCONFIG_SONGSOURCE">Låtkälla</string>
+  <string name="TR_SCREENCONFIG_GAMEMODE">Spelläge</string>
+  <string name="TR_SCREENNAMES_TITLE">Tripp-Trapp-Trull: Välj spelare</string>
   <string name="TR_SCREENNAMES_TEAM1">Lag 1</string>
   <string name="TR_SCREENNAMES_TEAM2">Lag 2</string>
+  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Välj slumpmässiga</string>
   <string name="TR_SCREENMAIN_TITLE">Tripp-Trapp-Trull</string>
   <string name="TR_SCREENMAIN_TEAM_CHOOSE">Välj ett fält.</string>
   <string name="TR_SCREENMAIN_NEXT_PLAYER">Nästa spelare</string>
   <string name="TR_SCREENMAIN_POPUP_REALLYEXIT">Avsluta Tripp-Trapp-Trull?</string>
   <string name="TR_SCREENMAIN_WINNER">Och vinnare är...</string>
-  <string name="TR_SCREENMAIN_NOWINNER">Det finns ingen vinnare denna omgång...</string>
+  <string name="TR_SCREENMAIN_NOWINNER">Det blev ingen vinnare denna omgång...</string>
 </resources>
diff --git a/Vocaluxe/Website/locales/sv.json b/Vocaluxe/Website/locales/sv.json
index 81d607bb..53203293 100644
--- a/Vocaluxe/Website/locales/sv.json
+++ b/Vocaluxe/Website/locales/sv.json
@@ -1,12 +1,12 @@
 {
-    "loginName": "Användare:",
+    "loginName": "Användarnamn:",
     "loginPassword": "Lösenord:",
-    "loginButton": "Inloggning",
-    "registerButton": "Skapa Profil",
-    "discoverReadQrButton": "Scanna QRCode",
-    "mainPageYourProfileLink": "Din Profil",
+    "loginButton": "Logga in",
+    "registerButton": "Skapa profil",
+    "discoverReadQrButton": "Scanna QR-kod",
+    "mainPageYourProfileLink": "Din profil",
     "mainPageYourProfileLinkDesc": "Ändra din profil",
-    "mainPageCurrentSongLink": "Nuvarande Låt",
+    "mainPageCurrentSongLink": "Nuvarande låt",
     "mainPageCurrentSongLinkDesc": "Visa information om nuvarande låt",
     "mainPageSelectSong": "Alla låtar",
     "mainPageSelectSongDesc": "Lista alla tillgängliga låtar",
@@ -14,25 +14,25 @@
     "mainPageSelectPlaylistDesc": "Visa alla spellistor",
     "mainPageSelectProfile": "Profiler",
     "mainPageSelectProfileDesc": "Visa alla profiler",
-    "mainPageTakePhotoLink": "Ta Foto",
+    "mainPageTakePhotoLink": "Ta foto",
     "mainPageTakePhotoLinkDesc": "Tar ett foto och visar det i slutet av rundan",
     "mainPageKeyboard": "Tangentbord",
-    "mainPageKeyboardDesc": "Skicka tangenter",
+    "mainPageKeyboardDesc": "Skicka tangenttryck",
     "mainPageSelectUserAdmin": "Administration",
     "mainPageSelectUserAdminDesc": "Konfigurera användarrättigheter",
     "mainPageLogoutLink": "Logga ut",
-    "mainPageLogoutLinkDesc": "Avsluta sessionen",
+    "mainPageLogoutLinkDesc": "Avslutar sessionen",
     "selectProfileHeader": "Alla profiler",
     "displayProfileHeader": "Profil",
     "displayProfileName": "Namn:",
-    "displayProfilePlayerType": "Spelar Typ:",
+    "displayProfilePlayerType": "Spelartyp:",
     "displayProfilePlayerTypeNormal": "Normal",
     "displayProfilePlayerTypeGuest": "Gäst",
     "displayProfilePlayerDifficulty": "Svårighetsgrad:",
     "displayProfilePlayerDifficultyEasy": "Lätt",
-    "displayProfilePlayerDifficultyNormal": "Normal",
-    "displayProfilePlayerDifficultyHard": "Svårt",
-    "displayProfilePlayerPassword": "Nytt Lösenord:",
+    "displayProfilePlayerDifficultyNormal": "Medel",
+    "displayProfilePlayerDifficultyHard": "Svår",
+    "displayProfilePlayerPassword": "Nytt lösenord:",
     "displayProfilePlayerSaveButton": "Spara och ladda upp",
     "displaySongHeader": "Ingen nuvarande låt",
     "displaySongArtist": "Artist:",
@@ -48,9 +48,9 @@
     "keyboardButtonRight": "höger",
     "keyboardButtonDown": "ner",
     "keyboardButtonEscape": "avbryt",
-    "keyboardButtonTab": "tab",
-    "keyboardButtonReturn": "enter",
-    "keyboardButtonKeys": "För att skicka andra tangenter skriv här:",
+    "keyboardButtonTab": "tabb",
+    "keyboardButtonReturn": "retur",
+    "keyboardButtonKeys": "För att skicka andra tangenttryck skriv här:",
     "selectUserAdminHeader": "Alla profiler",
     "displayUserAdminHeader": "Profil",
     "displayUserAdminContentSaveButton": "Spara",
@@ -71,16 +71,16 @@
     "This is not a valid name.": "Detta är inget giltigt namn.",
     "Uploading profile...": "Laddar upp profil...",
     "songs": "låtar",
-    "YourName": "Ditt Namn",
+    "YourName": "Ditt namn",
     "discoverConnectHeader": "Anslut till server",
-    "discoverConnectServerAddress": "serveradress:",
+    "discoverConnectServerAddress": "Serveradress:",
     "discoverConnectButton": "Anslut",
     "Checking...": "Kontrollerar...",
     "timeout": "Timeout",
-    "keyboardButtonShift": "Shift",
+    "keyboardButtonShift": "Skift",
     "keyboardButtonAlt": "Alt",
-    "keyboardButtonCtrl": "Control",
+    "keyboardButtonCtrl": "Ctrl",
     "keyboardButtonBackspace": "Backsteg",
-    "keyboardAutoSend": "Auto skicka knappar",
+    "keyboardAutoSend": "Autoskicka knappar",
     "keyboardButtonSend": "Skicka"
 }
\ No newline at end of file