Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
Conflicts: Output/Languages/Swedish.xml
This commit is contained in:
commit
f2b0fb7f6a
47 files changed
+476
-152
No files matched your search
@@ -73,7 +73,7 @@
|
||||
<string name="TR_CONFIG_TIMERMODE_TOTAL">Totalt</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_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>
|
||||
|
||||
Reference in new issue
Block a user