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

Merge branch 'develop' of git://github.com/KoMaDoctors/Vocaluxe into SongListView

Browse Source 
Conflicts:
	Vocaluxe/Base/CConfig.cs
	VocaluxeLib/Menu/SongMenu/CSongMenu.cs
This commit is contained in:
Flamefire committed 2014-12-09 21:49:33 +01:00
2 parents 7e104f7167 b4414cf08f
commit 20b2e735ec
5 files changed
+664 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/English.xml
+1 -1
View File
@@ -46,7 +46,7 @@
<string name="TR_CONFIG_LEVEL2">Level 2</string>
<string name="TR_CONFIG_LEVEL3">Level 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Max</string>
<string name="TR_CONFIG_LIST">List</string>
<string name="TR_CONFIG_LIST">Song List</string>
<string name="TR_CONFIG_DREIDEL">Dreidel</string>
<string name="TR_CONFIG_TILE_BOARD">TileBoard</string>
<string name="TR_CONFIG_BOOK">Book</string>
Output/Languages/German.xml
+1 -1
View File
@@ -46,7 +46,7 @@
<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">Liste</string>
<string name="TR_CONFIG_LIST">Songliste</string>
<string name="TR_CONFIG_DREIDEL">Dreidel</string>
<string name="TR_CONFIG_TILE_BOARD">TileBoard</string>
<string name="TR_CONFIG_BOOK">Book</string>