Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into Better_Graphics_Handling
Conflicts: Vocaluxe/COSFunctions.cs VocaluxeLib/CHelper.cs VocaluxeLib/Menu/CStatic.cs VocaluxeLib/Structs.cs
This commit is contained in:
commit
c156fa69ab
550 files changed
+22434
-23687
No files matched your search
@@ -76,6 +76,7 @@
|
||||
<string name="TR_CONFIG_OWN_MUSIC">Musique personnelle et Musique de fond</string>
|
||||
<string name="TR_CONFIG_NO_OWN_MUSIC">Pas de Musique personnelle</string>
|
||||
<string name="TR_CONFIG_ONLY_OWN_MUSIC">Seulement la Musique personnelle</string>
|
||||
<string name="TR_CONFIG_ONLY_SONG">Seulement les chansons sélectionnées</string>
|
||||
<string name="TR_CONFIG_FADEPLAYERINFO_ALL">Tout</string>
|
||||
<string name="TR_CONFIG_FADEPLAYERINFO_INFO">Seulement noms et avatars</string>
|
||||
<string name="TR_CONFIG_FADEPLAYERINFO_OFF">Rien</string>
|
||||
|
||||
@@ -76,6 +76,7 @@
|
||||
<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_OFF">Ingenting</string>
|
||||
|
||||
Reference in new issue
Block a user