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

Merge remote-tracking branch 'refs/remotes/Vocaluxe/develop' into More-Customisable-Notes

Browse Source
This commit is contained in:
Jiiniasu committed 2017-01-07 10:57:34 +01:00
2 parents 9cf8126603 afc9172f97
commit 7ab90dbaa5
74 files changed
+904 -448
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.appveyor/gitDescribe.ps1
+1 -1
View File
@@ -1,6 +1,6 @@
if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
{
$Env:VersionTag = "PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
$Env:VersionTag = "0.0.0-na-PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
Return $Env:VersionTag
}
.gitignore
+4
View File
@@ -28,6 +28,8 @@ tx.exe
*.vshost.*
*.userprefs
*.user
*.VC.db
*.VC.opendb
/*.vsp
/*.ctl
/Output/Config.xml
@@ -65,3 +67,5 @@ tx.exe
/packages
/Output/x64
/Output/x86
/PitchTracker/bin
/PitchTracker/obj
Output/Languages/Asturian.xml
-55
View File
@@ -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>
Output/Languages/Czech.xml
+25 -14
View File
@@ -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>
Output/Languages/Dutch.xml
+8 -1
View File
@@ -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>
@@ -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>
Output/Languages/English.xml
+5 -1
View File
@@ -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>
Output/Languages/French.xml
+8 -2
View File
@@ -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>
Output/Languages/German.xml
+39 -31
View File
@@ -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>
Output/Languages/Hungarian.xml
+68 -54
View File
@@ -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>
Output/Languages/Italian.xml
+12 -7
View File
@@ -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>
Output/Languages/Portuguese.xml
+20 -16
View File
@@ -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>
Output/Languages/Spanish.xml
+15 -32
View File
@@ -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>
Output/Languages/Swedish.xml
+10 -6
View File
@@ -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>
@@ -73,12 +73,14 @@
<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>
<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>
@@ -163,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>
@@ -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">Topplistsvy</string>
<string name="TR_SCREENORECORD_OPTIONS">Inspelningsalternativ</string>
<string name="TR_SCREENORECORD_DEVICE">Enhet</string>
<string name="TR_SCREENORECORD_INPUT">Ingång</string>
@@ -201,6 +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">Karaokeeffekt</string>
<string name="TR_SCREENOTHEME_OPTIONS">Temaalternativ</string>
<string name="TR_SCREENOTHEME_THEME">Tema</string>
<string name="TR_SCREENOTHEME_SKIN">Skal</string>
Output/Languages/Turkish.xml
+8 -1
View File
@@ -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>
Output/PartyModes/Challenge/Languages/Asturian.xml
+1 -1
View File
@@ -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>
Output/PartyModes/Challenge/Languages/Swedish.xml
+10 -10
View File
@@ -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>
Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
+1 -1
View File
@@ -187,7 +187,7 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>1)</Text>
<Text />
</Text>
<Text Name="TextRoundPlayer">
<X>0</X>
Output/PartyModes/ChallengeMedley/Languages/Asturian.xml
+1 -1
View File
@@ -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>
Output/PartyModes/ChallengeMedley/Languages/Swedish.xml
+12 -12
View File
@@ -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>
Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
+1 -1
View File
@@ -187,7 +187,7 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>1)</Text>
<Text />
</Text>
<Text Name="TextRoundPlayer">
<X>0</X>
Output/PartyModes/TicTacToe/Languages/Asturian.xml
+2 -2
View File
@@ -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>
Output/PartyModes/TicTacToe/Languages/French.xml
+4 -4
View File
@@ -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>
Output/PartyModes/TicTacToe/Languages/Italian.xml
+1 -1
View File
@@ -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>
Output/PartyModes/TicTacToe/Languages/Swedish.xml
+5 -4
View File
@@ -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>
Output/Themes/Ambient/Screens/ScreenHighscore.xml
+2 -2
View File
@@ -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>
</Screen>
Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
+57 -1
View File
@@ -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 />
Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+57 -1
View File
@@ -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">
@@ -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 />
Output/Themes/Changelog/Changelog_ScreenOptionsGame.txt
+6
View File
@@ -1,5 +1,11 @@
ScreenOptionsGame
++++++++++
Version 3:
Add:
<Text8>
<SelectSlideHighscoreStyle>
++++++++++
Version 2:
Output/Themes/Changelog/Changelog_ScreenOptionsSound.txt
+10
View File
@@ -1,5 +1,15 @@
ScreenOptionsSound
++++++++++
Version 4:
Add:
<SelectSlideKaraokeEffect>
and text for the description (Text7)
"TR_SCREENOSOUND_KARAOKEEFFECT"
++++++++++
Version 3:
PitchTracker/ptAKF.cpp
+7 -1
View File
@@ -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;
Vocaluxe/Base/CConfig.cs
+7
View File
@@ -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
}
@@ -139,6 +141,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
@@ -452,6 +455,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":
Vocaluxe/Base/CDataBase.cs
+2 -2
View File
@@ -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)
Vocaluxe/Base/CMain.cs
+5
View File
@@ -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;
Vocaluxe/Base/CParty.cs
+1 -1
View File
@@ -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;
Vocaluxe/Base/CPlaylists.cs
+5
View File
@@ -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; }
Vocaluxe/Base/CSettings.cs
+44 -15
View File
@@ -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,11 +220,10 @@ namespace Vocaluxe.Base
{
string version = _Version + " (" + _Arch + ")";
// ReSharper disable ConditionIsAlwaysTrueOrFalse
if (VersionRevision != ERevision.Release)
string gitversion = Application.ProductVersion;
if (VersionRevision != ERevision.Release || gitversion.Split('-')[1] != "0")
{
// ReSharper restore ConditionIsAlwaysTrueOrFalse
string gitversion = Application.ProductVersion;
version += " " + _GetVersionStatus() + String.Format(" ({0})", gitversion);
}
@@ -200,10 +233,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 +242,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;
Vocaluxe/Base/CSound.cs
+3 -2
View File
@@ -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)
Vocaluxe/Lib/Database/CHighscoreDB.cs
+33 -5
View File
@@ -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,9 +304,37 @@ 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 " +
"ORDER BY [Score] DESC";
switch (style)
{
case EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_BEST:
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 " +
"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 " +
"WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
"GROUP BY sc.PlayerName, sc.Difficulty, sc.LineNr, sc.Score " +
") 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 Scores " +
"WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
"ORDER BY [Score] DESC, [Date] ASC";
break;
}
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;
@@ -475,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, " +
Vocaluxe/Lib/Draw/CDirect3D.cs
+3 -3
View File
@@ -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();
}
}
Vocaluxe/Lib/Draw/CDrawWinForm.cs
+1 -1
View File
@@ -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);
}
Vocaluxe/Lib/Draw/COpenGL.cs
+2 -2
View File
@@ -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);
}
}
Vocaluxe/Lib/Input/CGamePad.cs
+1 -1
View File
@@ -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;
Vocaluxe/Lib/Sound/EAudioEffect.cs
+14
View File
@@ -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
}
}
Vocaluxe/Lib/Sound/Playback/CAudioStreamBase.cs
+3 -1
View File
@@ -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()
Vocaluxe/Lib/Sound/Playback/CPlaybackBase.cs
+3 -3
View File
@@ -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))
{
Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
+15 -12
View File
@@ -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
@@ -72,9 +75,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);
}
}
}
Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs
+41 -4
View File
@@ -19,6 +19,7 @@ using System;
using GLib;
using Gst;
using Vocaluxe.Base;
using VocaluxeLib;
namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
{
@@ -101,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)
{
@@ -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 (_Effect.HasFlag(EAudioEffect.Karaoke))
{
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;
Vocaluxe/Lib/Sound/Playback/IPlayback.cs
+1 -1
View File
@@ -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);
Vocaluxe/Lib/Sound/Playback/OpenAL/COpenALPlay.cs
+2 -2
View File
@@ -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);
}
}
}
Vocaluxe/Lib/Sound/Playback/OpenAL/COpenAlStream.cs
+1 -1
View File
@@ -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)
{
Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioPlay.cs
+2 -2
View File
@@ -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);
}
}
}
Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioStream.cs
+1 -1
View File
@@ -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)
{
Vocaluxe/Lib/Video/Acinerella/CDecoderThread.cs
+51 -10
View File
@@ -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()
Vocaluxe/Linux/Build/PostBuildEvent.sh
+2
View File
@@ -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
Vocaluxe/Linux/Build/PreBuildEvent.sh
+2
View File
@@ -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
Vocaluxe/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -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")]
Vocaluxe/Screens/CScreenCredits.cs
+4 -4
View File
@@ -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 };
Vocaluxe/Screens/CScreenHighscore.cs
+3 -2
View File
@@ -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);
@@ -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);
}
}
Vocaluxe/Screens/CScreenMain.cs
+1 -3
View File
@@ -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;
}
Vocaluxe/Screens/CScreenOptionsGame.cs
+5 -2
View File
@@ -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();
Vocaluxe/Screens/CScreenOptionsSound.cs
+12 -2
View File
@@ -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";
@@ -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);
Vocaluxe/Screens/CScreenSing.cs
+2 -1
View File
@@ -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;
Vocaluxe/Screens/CScreenSong.cs
+15 -15
View File
@@ -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;
}
Vocaluxe/Vocaluxe.csproj
+15 -14
View File
@@ -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" />
@@ -478,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.
@@ -535,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="'$(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="!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="'$(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="!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="'$(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="!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="'$(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.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.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="'$(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.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="'$(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.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="'$(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.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="'$(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.10\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.10\build\vocaluxe.dependencies.targets')" />
</Project>
Vocaluxe/Website/locales/Hungarian.json
+86
View File
@@ -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"
}
Vocaluxe/Website/locales/sv.json
+21 -21
View File
@@ -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"
}
Vocaluxe/packages.config
+6 -6
View File
@@ -1,15 +1,15 @@
<?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.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" />
<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.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" />
VocaluxeLib/Enums.cs
+6
View File
@@ -369,6 +369,12 @@ namespace VocaluxeLib
Game
}
public enum EHighscoreStyle
{
TR_CONFIG_HIGHSCORE_LIST_ALL,
TR_CONFIG_HIGHSCORE_LIST_BEST
}
/// <summary>
/// Base screens
/// </summary>
VocaluxeLib/IBasic.cs
+2
View File
@@ -46,6 +46,8 @@ namespace VocaluxeLib
ESongMenu GetSongMenuType();
EHighscoreStyle GetHighscoreStyle();
EOffOn GetDrawNoteLines();
EOffOn GetDrawToneHelper();
VocaluxeLib/Menu/CMenuPartyNameSelection.cs
+5 -2
View File
@@ -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
@@ -725,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);
@@ -774,7 +776,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);
}
}
}
VocaluxeLib/Menu/CNameSelection.cs
+3 -15
View File
@@ -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()
VocaluxeLib/Menu/CPlaylist.cs
+1
View File
@@ -1087,6 +1087,7 @@ namespace VocaluxeLib.Menu
};
_PlaylistElementContents.Add(pec);
}
_SetSelectionToFirstEntry();
_Update();
return true;
}
VocaluxeLib/Menu/CSelectSlide.cs
+20 -4
View File
@@ -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);
}
}
appveyor.yml
+49 -22
View File
@@ -11,47 +11,72 @@ 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: >-
- 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
#(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 +92,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 +102,5 @@ deploy:
artifact: ReleaseZip
on:
APPVEYOR_REPO_TAG: true
NIGHTLY_BUILD: true
NIGHTLY_BUILD: true
MAIN_REPO: true