diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml
index 06ce81a0..9d725abc 100644
--- a/Output/Languages/Spanish.xml
+++ b/Output/Languages/Spanish.xml
@@ -210,8 +210,6 @@
Cámaras web
Resolución cámara web
Ajustes de pantalla
- Pulsa CTRL + ALT + SHIFT + Flechas para ajustar la pantalla
- CTRL + ALT + SHIFT + 0 para reiniciar
Arriba izquierda
Abajo derecha
Abajo izquierda
diff --git a/Output/Languages/Swedish.xml b/Output/Languages/Swedish.xml
index 92c72192..8d400dac 100644
--- a/Output/Languages/Swedish.xml
+++ b/Output/Languages/Swedish.xml
@@ -93,6 +93,7 @@
Party
Alternativ
Profiler
+ Inga profiler funna!
Party Läge Väljare
Party Läge
Beskrivning
@@ -100,6 +101,7 @@
Version
kan ej ladda detta party läge
Det finns inga mikrofoner konfigurerade!
+ %d mikrofoner krävs för denna party-mode!
Mål publik
Inga lag
Antal lag
@@ -211,8 +213,8 @@
Webkameror
Webkamera Upplösning
Skärmjusteringar
- Tryck CTRL + ALT +SHIFT + Pilar för att justera skärmen
- CTRL + ALT + SHIFT + 0 för att återställa
+ Tryck CTR + ALT (+ SHIFT) + Pilar"+" för att justera skärmen
+ CTR + ALT + 0 för att återställa
Överst till vänster
Överst till höger
Nederst till vänster
diff --git a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
index 938bddc6..d00a1f5b 100644
--- a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
+++ b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
@@ -436,44 +436,42 @@ namespace VocaluxeLib.PartyModes.Challenge
GameData.Results[i, j] = 0;
}
}
- else
+ SPlayer[] results = CBase.Game.GetPlayers();
+ if (results == null)
+ return;
+
+ if (results.Length < GameData.NumPlayerAtOnce)
+ return;
+
+ for (int j = 0; j < GameData.NumPlayerAtOnce; j++)
+ GameData.Results[GameData.CurrentRoundNr - 2, j] = (int)Math.Round(results[j].Points);
+
+ List points = _GetPointsForPlayer(results);
+
+ for (int i = 0; i < GameData.NumPlayerAtOnce; i++)
{
- SPlayer[] results = CBase.Game.GetPlayers();
- if (results == null)
- return;
-
- if (results.Length < GameData.NumPlayerAtOnce)
- return;
-
- for (int j = 0; j < GameData.NumPlayerAtOnce; j++)
- GameData.Results[GameData.CurrentRoundNr - 2, j] = (int)Math.Round(results[j].Points);
-
- List points = _GetPointsForPlayer(results);
-
- for (int i = 0; i < GameData.NumPlayerAtOnce; i++)
+ int index = -1;
+ for (int j = 0; j < GameData.ResultTable.Count; j++)
{
- int index = -1;
- for (int j = 0; j < GameData.ResultTable.Count; j++)
+ if (points[i].ProfileID == GameData.ResultTable[j].PlayerID)
{
- if (points[i].ProfileID == GameData.ResultTable[j].PlayerID)
- {
- index = j;
- break;
- }
+ index = j;
+ break;
}
-
- if (index == -1)
- continue;
- CResultTableRow row = GameData.ResultTable[index];
-
- row.NumPlayed++;
- row.NumWon += points[i].Won;
- row.NumSingPoints += points[i].SingPoints;
- row.NumGamePoints += points[i].GamePoints;
-
- GameData.ResultTable[index] = row;
}
+
+ if (index == -1)
+ continue;
+ CResultTableRow row = GameData.ResultTable[index];
+
+ row.NumPlayed++;
+ row.NumWon += points[i].Won;
+ row.NumSingPoints += points[i].SingPoints;
+ row.NumGamePoints += points[i].GamePoints;
+
+ GameData.ResultTable[index] = row;
}
+
GameData.ResultTable.Sort();
diff --git a/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs b/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs
index 8d433eaf..5f2d6a1b 100644
--- a/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs
+++ b/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs
@@ -196,7 +196,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
case EStage.Main:
return _Screens["CPartyScreenChallengeMedleyMain"];
case EStage.Singing:
- return CBase.Graphics.GetScreen(EScreen.Song);
+ return CBase.Graphics.GetScreen(EScreen.Sing);
default:
throw new ArgumentException("Invalid stage: " + _Stage);
}
@@ -508,60 +508,58 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
GameData.Results[i, j] = 0;
}
}
- else
+
+ CPoints gamePoints = CBase.Game.GetPoints();
+ if (gamePoints == null || gamePoints.NumPlayer < GameData.NumPlayerAtOnce)
+ return;
+
+ SPlayer[] results = gamePoints.GetPlayer(0, GameData.NumPlayerAtOnce);
+ if (results == null)
+ return;
+
+ if (results.Length < GameData.NumPlayerAtOnce)
+ return;
+
+ if (gamePoints.NumRounds == 0)
+ return;
+
+ for (int i = 1; i < gamePoints.NumRounds; i++)
{
- CPoints gamePoints = CBase.Game.GetPoints();
- if (gamePoints == null || gamePoints.NumPlayer < GameData.NumPlayerAtOnce)
- return;
+ SPlayer[] temp = gamePoints.GetPlayer(i, GameData.NumPlayerAtOnce);
+ for (int p = 0; p < GameData.NumPlayerAtOnce; p++)
+ results[p].Points += temp[p].Points;
+ }
- SPlayer[] results = gamePoints.GetPlayer(0, GameData.NumPlayerAtOnce);
- if (results == null)
- return;
+ for (int j = 0; j < GameData.NumPlayerAtOnce; j++)
+ {
+ results[j].Points = results[j].Points / gamePoints.NumRounds;
+ GameData.Results[GameData.CurrentRoundNr - 2, j] = (int)Math.Round(results[j].Points);
+ }
- if (results.Length < GameData.NumPlayerAtOnce)
- return;
+ List points = _GetPointsForPlayer(results);
- if (gamePoints.NumRounds == 0)
- return;
-
- for (int i = 1; i < gamePoints.NumRounds; i++)
+ for (int i = 0; i < GameData.NumPlayerAtOnce; i++)
+ {
+ int index = -1;
+ for (int j = 0; j < GameData.ResultTable.Count; j++)
{
- SPlayer[] temp = gamePoints.GetPlayer(i, GameData.NumPlayerAtOnce);
- for (int p = 0; p < GameData.NumPlayerAtOnce; p++)
- results[p].Points += temp[p].Points;
+ if (points[i].ProfileID == GameData.ResultTable[j].PlayerID)
+ {
+ index = j;
+ break;
+ }
}
- for (int j = 0; j < GameData.NumPlayerAtOnce; j++)
+ if (index != -1)
{
- results[j].Points = results[j].Points / gamePoints.NumRounds;
- GameData.Results[GameData.CurrentRoundNr - 2, j] = (int)Math.Round(results[j].Points);
- }
+ CResultTableRow row = GameData.ResultTable[index];
- List points = _GetPointsForPlayer(results);
+ row.NumPlayed++;
+ row.NumWon += points[i].Won;
+ row.NumSingPoints += points[i].SingPoints;
+ row.NumGamePoints += points[i].GamePoints;
- for (int i = 0; i < GameData.NumPlayerAtOnce; i++)
- {
- int index = -1;
- for (int j = 0; j < GameData.ResultTable.Count; j++)
- {
- if (points[i].ProfileID == GameData.ResultTable[j].PlayerID)
- {
- index = j;
- break;
- }
- }
-
- if (index != -1)
- {
- CResultTableRow row = GameData.ResultTable[index];
-
- row.NumPlayed++;
- row.NumWon += points[i].Won;
- row.NumSingPoints += points[i].SingPoints;
- row.NumGamePoints += points[i].GamePoints;
-
- GameData.ResultTable[index] = row;
- }
+ GameData.ResultTable[index] = row;
}
}
diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs
index 950551ee..fb89cc72 100644
--- a/Vocaluxe/Screens/CScreenSong.cs
+++ b/Vocaluxe/Screens/CScreenSong.cs
@@ -629,10 +629,11 @@ namespace Vocaluxe.Screens
_SongMenu.OnShow();
if (_Sso.Selection.PartyMode)
+ {
_PlaylistActive = false;
-
- if (_Sso.Selection.PartyMode)
_ToggleSongOptions(ESongOptionsView.None);
+ _SelectElement(_Buttons[_ButtonStart]);
+ }
_SongMenu.Selected = !_PlaylistActive;
_SongMenu.SmallView = _Playlist.Visible;
diff --git a/Vocaluxe/Website/locales/sv.json b/Vocaluxe/Website/locales/sv.json
index dafc5bcc..81d607bb 100644
--- a/Vocaluxe/Website/locales/sv.json
+++ b/Vocaluxe/Website/locales/sv.json
@@ -80,7 +80,7 @@
"keyboardButtonShift": "Shift",
"keyboardButtonAlt": "Alt",
"keyboardButtonCtrl": "Control",
- "keyboardButtonBackspace": "Backspace",
- "keyboardAutoSend": "Auto send keys",
- "keyboardButtonSend": "Send"
+ "keyboardButtonBackspace": "Backsteg",
+ "keyboardAutoSend": "Auto skicka knappar",
+ "keyboardButtonSend": "Skicka"
}
\ No newline at end of file
diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs
index 4a7b28eb..ced7bb57 100644
--- a/VocaluxeLib/Menu/CPlaylist.cs
+++ b/VocaluxeLib/Menu/CPlaylist.cs
@@ -1037,14 +1037,16 @@ namespace VocaluxeLib.Menu
Cover = new CStatic(_Theme.StaticCover, _PartyModeID)
};
+ en.Cover.LoadSkin();
en.Cover.Y += Rect.Y + (i * _Theme.EntryHeight);
- en.Cover.X += Rect.X;
+ en.Cover.X += Rect.X;
en.Text1 = new CText(_Text1);
en.Text1.X += Rect.X;
en.Text1.Y += Rect.Y + (i * _Theme.EntryHeight);
en.SelectSlide = new CSelectSlide(_SelectSlideGameMode);
+ en.SelectSlide.LoadSkin();
en.SelectSlide.X += Rect.X;
en.SelectSlide.Y += Rect.Y + (i * _Theme.EntryHeight);