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

Merge remote-tracking branch 'remotes/upstream/develop' into develop

Browse Source 
Conflicts:
	Output/Languages/German.xml
	Output/PartyModes/Challenge/Languages/German.xml
	Output/PartyModes/ChallengeMedley/Languages/German.xml
	Output/PartyModes/TicTacToe/Languages/German.xml
This commit is contained in:
Stephan Sundermann committed 2013-01-06 20:35:43 +01:00
2 parents 975bcbbe2e 02e60773ab
commit 99a1bdcf8b
31 files changed
+1054 -355
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/German.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<resources>
<resources>
<string name="language">Deutsch</string>
<string name="TR_PROGRAM_NAME">Vocaluxe</string>
<string name="TR_GENERAL_AND">und</string>