Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated and added some translation strings

Browse Source
This commit is contained in:
Florian Küpper committed 2017-09-12 10:10:59 +02:00
1 parent 6ba8eebb20
commit 52c58bd7a7
9 files changed
+29 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/English.xml
+5
View File
@@ -15,6 +15,7 @@
<string name="TR_DEBUG_SONGS">Loaded songs</string>
<string name="TR_DEBUG_MOUSE">Mouse</string>
<string name="TR_DEBUG_MEMORY">Memory usage</string>
<string name="TR_GAMEMODE">Game mode</string>
<string name="TR_GAMEMODE_NORMAL">Normal</string>
<string name="TR_GAMEMODE_DUET">Duet</string>
<string name="TR_GAMEMODE_MEDLEY">Medley</string>
@@ -31,6 +32,10 @@
<string name="TR_USERROLE_NORMAL">Normal user</string>
<string name="TR_USERROLE_ADMIN">Administrator</string>
<string name="TR_USERROLE_KEYBOARDUSER">Keyboard user</string>
<string name="TR_SONGSOURCE">Song source</string>
<string name="TR_SONGSOURCE_PLAYLIST">Playlist</string>
<string name="TR_SONGSOURCE_CATEGORY">Category</string>
<string name="TR_SONGSOURCE_ALLSONGS">All songs</string>
<string name="TR_CONFIG_SOFTWARE">Software</string>
<string name="TR_CONFIG_OPENGL">OpenGL</string>
<string name="TR_CONFIG_DIRECT3D">Direct3D</string>
Output/PartyModes/Challenge/Languages/English.xml
+1
View File
@@ -11,6 +11,7 @@
<string name="TR_BUTTON_YES">Yes</string>
<string name="TR_BUTTON_NO">No</string>
<string name="TR_BUTTON_NEXT_ROUND">Next Round</string>
<string name="TR_SONGS">Songs</string>
<string name="TR_SCREENCONFIG_TITLE">Challenge Mode: Configuration</string>
<string name="TR_SCREENCONFIG_NUMPLAYERS">Number of players</string>
<string name="TR_SCREENCONFIG_NUMMICS">Number of mics</string>
Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeSongs.xml
+2 -2
View File
@@ -53,7 +53,7 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENCONFIG_SONGSOURCE</Text>
<Text>TR_SONGSOURCE</Text>
</Text>
<Text Name="TextSongMode">
<X>75</X>
@@ -67,7 +67,7 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENCONFIG_GAMEMODE</Text>
<Text>TR_GAMEMODE</Text>
</Text>
</Texts>
<Buttons>
Output/PartyModes/TicTacToe/Languages/English.xml
+1 -5
View File
@@ -13,15 +13,11 @@
<string name="TR_BUTTON_NEXT_ROUND">Start</string>
<string name="TR_SONGS">Songs</string>
<string name="TR_TEAM">Team</string>
<string name="TR_PLAYLIST">Playlist</string>
<string name="TR_CATEGORY">Category</string>
<string name="TR_ALLSONGS">All songs</string>
<string name="TR_SCREENCONFIG_TITLE">Tic-Tac-Toe: Configuration</string>
<string name="TR_SCREENCONFIG_NUMPLAYERST1">Number of players in team 1</string>
<string name="TR_SCREENCONFIG_NUMPLAYERST2">Number of players in team 2</string>
<string name="TR_SCREENCONFIG_NUMFIELDS">Number of fields</string>
<string name="TR_SCREENCONFIG_SONGSOURCE">Song-Source</string>
<string name="TR_SCREENCONFIG_GAMEMODE">Game-Mode</string>
<string name="TR_SCREENCONFIG_REFILLJOKERS">Refill jokers every round</string>
<string name="TR_SCREENNAMES_TITLE">Tic-Tac-Toe: Choose Player</string>
<string name="TR_SCREENNAMES_TEAM1">Team 1</string>
<string name="TR_SCREENNAMES_TEAM2">Team 2</string>
Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeSongs.xml
+3 -3
View File
@@ -53,7 +53,7 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENCONFIG_SONGSOURCE</Text>
<Text>TR_SONGSOURCE</Text>
</Text>
<Text Name="TextSongMode">
<X>75</X>
@@ -67,7 +67,7 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENCONFIG_GAMEMODE</Text>
<Text>TR_GAMEMODE</Text>
</Text>
</Texts>
<Buttons>
@@ -404,4 +404,4 @@
<Playlists />
<ParticleEffects />
<ScreenSettings />
</Screen>
</Screen>
PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
+7 -7
View File
@@ -175,7 +175,7 @@ namespace VocaluxeLib.PartyModes.Challenge
CurrentRoundNr = 1,
ProfileIDs = new List<int>(),
Sorting = CBase.Config.GetSongSorting(),
SongSource = ESongSource.TR_ALLSONGS,
SongSource = ESongSource.TR_SONGSOURCE_ALLSONGS,
PlaylistID = 0,
CategoryIndex = 0,
GameMode = EGameMode.TR_GAMEMODE_NORMAL,
@@ -313,7 +313,7 @@ namespace VocaluxeLib.PartyModes.Challenge
{
switch(GameData.SongSource)
{
case ESongSource.TR_ALLSONGS:
case ESongSource.TR_SONGSOURCE_ALLSONGS:
_ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting();
_ScreenSongOptions.Sorting.Tabs = CBase.Config.GetTabs();
_ScreenSongOptions.Sorting.FilterPlaylistID = -1;
@@ -321,7 +321,7 @@ namespace VocaluxeLib.PartyModes.Challenge
_ScreenSongOptions.Selection.CategoryChangeAllowed = true;
break;
case ESongSource.TR_CATEGORY:
case ESongSource.TR_SONGSOURCE_CATEGORY:
_ScreenSongOptions.Sorting.SongSorting = GameData.Sorting;
_ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_ON;
_ScreenSongOptions.Sorting.FilterPlaylistID = -1;
@@ -334,7 +334,7 @@ namespace VocaluxeLib.PartyModes.Challenge
_ScreenSongOptions.Selection.CategoryChangeAllowed = false;
break;
case ESongSource.TR_PLAYLIST:
case ESongSource.TR_SONGSOURCE_PLAYLIST:
_ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting();
_ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_OFF;
_ScreenSongOptions.Sorting.FilterPlaylistID = GameData.PlaylistID;
@@ -541,7 +541,7 @@ namespace VocaluxeLib.PartyModes.Challenge
switch (GameData.SongSource)
{
case ESongSource.TR_PLAYLIST:
case ESongSource.TR_SONGSOURCE_PLAYLIST:
for (int i = 0; i < CBase.Playlist.GetSongCount(GameData.PlaylistID); i++)
{
int id = CBase.Playlist.GetSong(GameData.PlaylistID, i).SongID;
@@ -550,12 +550,12 @@ namespace VocaluxeLib.PartyModes.Challenge
}
break;
case ESongSource.TR_ALLSONGS:
case ESongSource.TR_SONGSOURCE_ALLSONGS:
ReadOnlyCollection<CSong> avSongs = CBase.Songs.GetSongs();
GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(EGameMode.TR_GAMEMODE_MEDLEY)).Select(song => song.ID));
break;
case ESongSource.TR_CATEGORY:
case ESongSource.TR_SONGSOURCE_CATEGORY:
CBase.Songs.SetCategory(GameData.CategoryIndex);
avSongs = CBase.Songs.GetVisibleSongs();
GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(EGameMode.TR_GAMEMODE_MEDLEY)).Select(song => song.ID));
PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
+4 -4
View File
@@ -155,7 +155,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
CurrentRoundNr = 0,
FieldNr = 0,
Sorting = CBase.Config.GetSongSorting(),
SongSource = ESongSource.TR_ALLSONGS,
SongSource = ESongSource.TR_SONGSOURCE_ALLSONGS,
PlaylistID = 0,
CategoryIndex = 0,
GameMode = EGameMode.TR_GAMEMODE_NORMAL,
@@ -438,7 +438,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
switch (GameData.SongSource)
{
case ESongSource.TR_PLAYLIST:
case ESongSource.TR_SONGSOURCE_PLAYLIST:
for (int i = 0; i < CBase.Playlist.GetSongCount(GameData.PlaylistID); i++)
{
int id = CBase.Playlist.GetSong(GameData.PlaylistID, i).SongID;
@@ -447,12 +447,12 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
break;
case ESongSource.TR_ALLSONGS:
case ESongSource.TR_SONGSOURCE_ALLSONGS:
ReadOnlyCollection<CSong> avSongs = CBase.Songs.GetSongs();
GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(GameData.GameMode)).Select(song => song.ID));
break;
case ESongSource.TR_CATEGORY:
case ESongSource.TR_SONGSOURCE_CATEGORY:
CBase.Songs.SortSongs(GameData.Sorting, EOffOn.TR_CONFIG_ON, CBase.Config.GetIgnoreArticles(), "", EDuetOptions.All, -1);
CBase.Songs.SetCategory(GameData.CategoryIndex);
avSongs = CBase.Songs.GetVisibleSongs();
VocaluxeLib/Enums.cs
+3 -3
View File
@@ -216,9 +216,9 @@ namespace VocaluxeLib
public enum ESongSource
{
TR_ALLSONGS,
TR_CATEGORY,
TR_PLAYLIST
TR_SONGSOURCE_ALLSONGS,
TR_SONGSOURCE_CATEGORY,
TR_SONGSOURCE_PLAYLIST
}
public enum ESongSorting
VocaluxeLib/Menu/CMenuPartySongSelection.cs
+3 -3
View File
@@ -245,9 +245,9 @@ namespace VocaluxeLib.Menu
private void _UpdateSelectSlideVisibility()
{
_SelectSlides[_SelectSlideNumMedleySongs].Visible = SongMode == EGameMode.TR_GAMEMODE_MEDLEY;
_SelectSlides[_SelectSlidePlaylist].Visible = Source == ESongSource.TR_PLAYLIST;
_SelectSlides[_SelectSlideSorting].Visible = Source == ESongSource.TR_CATEGORY;
_SelectSlides[_SelectSlideCategory].Visible = Source == ESongSource.TR_CATEGORY;
_SelectSlides[_SelectSlidePlaylist].Visible = Source == ESongSource.TR_SONGSOURCE_PLAYLIST;
_SelectSlides[_SelectSlideSorting].Visible = Source == ESongSource.TR_SONGSOURCE_CATEGORY;
_SelectSlides[_SelectSlideCategory].Visible = Source == ESongSource.TR_SONGSOURCE_CATEGORY;
}
protected void _SetAllowedOptions()