diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index fc7a4ca2..434d4720 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -156,6 +156,7 @@ A-Z = Search artist and title, prefixes for the search → a: = artist • t: = title • c: = creator • e: = edition • g: = genre • y: = year (e.g. 1999 or 1980-1989) • l: = language • al: = album • fi: = file name • fo: = folder name 1-6 = Press your team number to use a random song joker Sorting: %s + No Medley for this song! Pause Stop singing Continue diff --git a/Output/Languages/German.xml b/Output/Languages/German.xml index dc0fc2d1..c043222f 100644 --- a/Output/Languages/German.xml +++ b/Output/Languages/German.xml @@ -151,6 +151,7 @@ A-Z = Interpreten und Titel durchsuchen, Präfixe für die Suche → a: = Interpret • t: = Titel • c: = Ersteller • e: = Edition • g: = Genre • y: = Jahr (z.B. 1999 oder 1980-1989) • l: = Sprache • al: = Album • fi: = Dateiname • fo: = Ordnername 1-6 = Drücke die Teamnummer um einen Zufallssong Joker zu verwenden Sortierung: %s + Kein Medley für diesen Song! Pause Lied beenden Fortfahren diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index 33130398..49f09f16 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -963,7 +963,12 @@ namespace Vocaluxe.Screens _SongMenu.Update(_Sso); _SongMenu.OnShow(); - _Texts[_TextShortInfoTop].Text = CBase.Language.Translate("TR_SCREENSONG_SORTING").Replace("%s", CBase.Language.Translate(_Sso.Sorting.SongSorting.ToString())); + _ShowInfoText(CBase.Language.Translate("TR_SCREENSONG_SORTING").Replace("%s", CBase.Language.Translate(_Sso.Sorting.SongSorting.ToString()))); + } + + private void _ShowInfoText(String text) + { + _Texts[_TextShortInfoTop].Text = text; _Statics[_StaticShortInfoTop].Visible = true; _Texts[_TextShortInfoTop].Visible = true; _TimerShortInfoText.Stop(); @@ -1035,7 +1040,10 @@ namespace Vocaluxe.Screens if (CSongs.IsInCategory && (songNr >= 0)) { if (!CSongs.VisibleSongs[songNr].IsGameModeAvailable(EGameMode.TR_GAMEMODE_MEDLEY)) + { + _ShowInfoText(CBase.Language.Translate("TR_SCREENSONG_NOMEDLEY")); return; + } CGame.Reset(); CGame.ClearSongs();