7 files changed, 42 insertions, 6 deletions
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index c1bcbc006c..a9d1ecc721 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -45,7 +45,7 @@
 #include <map>
 
 enum {
-	kKyraDatVersion = 70
+	kKyraDatVersion = 71
 };
 
 const ExtractFilename extractFilenames[] = {
@@ -163,6 +163,7 @@ const ExtractFilename extractFilenames[] = {
 	{ k1CreditsStrings, kTypeRawData, true },
 
 	// FM-TOWNS specific
+	{ k1TownsMusicFadeTable, k3TypeRaw16to8, false },
 	{ k1TownsSFXwdTable, kTypeTownsWDSfxTable, false },
 	{ k1TownsSFXbtTable, kTypeRawData, false },
 	{ k1TownsCDATable, kTypeRawData, false },
@@ -500,7 +501,7 @@ bool checkIndex(PAKFile &file) {
 
 void printHelp(const char *f) {
 	printf("Usage:\n");
-	printf("%s output inputfiles ...", f);
+	printf("%s output inputfiles ...\n", f);
 }
 
 bool process(PAKFile &out, const Game *g, const byte *data, const uint32 size);
@@ -898,6 +899,8 @@ const char *getIdString(const int id) {
 		return "k1GUIStrings";
 	case k1ConfigStrings:
 		return "k1ConfigStrings";
+	case k1TownsMusicFadeTable:
+		return "k1TownsMusicFadeTable";
 	case k1TownsSFXwdTable:
 		return "k1TownsSFXwdTable";
 	case k1TownsSFXbtTable:
diff --git a/tools/create_kyradat/create_kyradat.h b/tools/create_kyradat/create_kyradat.h
index 435e239381..d82e16fed0 100644
--- a/tools/create_kyradat/create_kyradat.h
+++ b/tools/create_kyradat/create_kyradat.h
@@ -138,6 +138,7 @@ enum kExtractID {
 
 	k1CreditsStrings,
 
+	k1TownsMusicFadeTable,
 	k1TownsSFXwdTable,
 	k1TownsSFXbtTable,
 	k1TownsCDATable,
diff --git a/tools/create_kyradat/games.cpp b/tools/create_kyradat/games.cpp
index 9976451067..1bd7d31648 100644
--- a/tools/create_kyradat/games.cpp
+++ b/tools/create_kyradat/games.cpp
@@ -411,6 +411,8 @@ const int kyra1TownsNeed[] = {
 	k1NewGameString,
 	k1ConfigStrings,
 
+	k1TownsMusicFadeTable,
+	k1TownsMusicFadeTable,
 	k1TownsSFXwdTable,
 	k1TownsSFXbtTable,
 	k1TownsCDATable,
diff --git a/tools/create_kyradat/tables.cpp b/tools/create_kyradat/tables.cpp
index a74f58e2c3..dc8163901d 100644
--- a/tools/create_kyradat/tables.cpp
+++ b/tools/create_kyradat/tables.cpp
@@ -968,6 +968,12 @@ const ExtractEntrySearchData k1ConfigStringsProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
+const ExtractEntrySearchData k1TownsMusicFadeTableProvider[] = {
+	{ UNK_LANG, kPlatformFMTowns, { 0x00000B10, 0x000076DE, { { 0x9F, 0x08, 0x5B, 0xD6, 0x25, 0x7F, 0x11, 0x08, 0x87, 0x45, 0x92, 0xD3, 0xE5, 0xA8, 0x7C, 0x2F } } } },
+
+	EXTRACT_END_ENTRY
+};
+	
 const ExtractEntrySearchData k1TownsSFXwdTableProvider[] = {
 	{ UNK_LANG, kPlatformFMTowns, { 0x00012608, 0x006717A1, { { 0x34, 0xDD, 0x2D, 0xA5, 0x14, 0x05, 0xEE, 0x2F, 0x93, 0x7C, 0x78, 0x4D, 0xCA, 0x13, 0xED, 0x93 } } } },
 
@@ -1823,6 +1829,7 @@ const ExtractEntry extractProviders[] = {
 	{ k1SpecialPalette33, k1SpecialPalette33Provider },
 	{ k1GUIStrings, k1GUIStringsProvider },
 	{ k1ConfigStrings, k1ConfigStringsProvider },
+	{ k1TownsMusicFadeTable, k1TownsMusicFadeTableProvider },
 	{ k1TownsSFXwdTable, k1TownsSFXwdTableProvider },
 	{ k1TownsSFXbtTable, k1TownsSFXbtTableProvider },
 	{ k1TownsCDATable, k1TownsCDATableProvider },
diff --git a/tools/create_msvc/create_msvc.cpp b/tools/create_msvc/create_msvc.cpp
index f7dba20486..384534e547 100644
--- a/tools/create_msvc/create_msvc.cpp
+++ b/tools/create_msvc/create_msvc.cpp
@@ -1669,7 +1669,7 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b
 	              "\t\tName=\"VCCLCompilerTool\"\n"
 	              "\t\tDisableLanguageExtensions=\"true\"\n"
 	              "\t\tDisableSpecificWarnings=\"" << _globalWarnings << "\"\n"
-	              "\t\tAdditionalIncludeDirectories=\"" << prefix << ";" << prefix << "\\engines;%(SCUMMVM_LIBS)\\include\"\n"
+	              "\t\tAdditionalIncludeDirectories=\"" << prefix << ";" << prefix << "\\engines;$(SCUMMVM_LIBS)\\include\"\n"
 	              "\t\tPreprocessorDefinitions=\"" << defines << "\"\n"
 	              "\t\tExceptionHandling=\"0\"\n"
 	              "\t\tRuntimeTypeInfo=\"false\"\n"
@@ -1686,7 +1686,7 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b
 	              "\t\tIgnoreDefaultLibraryNames=\"\"\n"
 	              "\t\tSubSystem=\"1\"\n"
 	              "\t\tEntryPointSymbol=\"WinMainCRTStartup\"\n"
-	              "\t\tAdditionalLibraryDirectories=\"%(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << "\"\n"
+	              "\t\tAdditionalLibraryDirectories=\"$(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << "\"\n"
 	              "\t/>\n"
 	              "\t<Tool\n"
 	              "\t\tName=\"VCResourceCompilerTool\"\n"
diff --git a/tools/credits.pl b/tools/credits.pl
index cf9becc9b5..f59c68021a 100755
--- a/tools/credits.pl
+++ b/tools/credits.pl
@@ -875,6 +875,12 @@ begin_credits("Credits");
 		begin_section("Russian");
 			add_person("Eugene Sandulenko", "sev", "");
 		end_section();
+		begin_section("Spanish");
+			add_person("Tom&aacute;s Maidagan", "Truido", "");
+		end_section();
+		begin_section("Ukrainian");
+			add_person("Lubomyr Lisen", "", "");
+		end_section();
 	end_section();
 
 	begin_section("Websites (design)");
diff --git a/tools/po2c b/tools/po2c
index 9dbc5e0fb7..10e15338c7 100755
--- a/tools/po2c
+++ b/tools/po2c
@@ -161,19 +161,29 @@ foreach my $l (keys(%msgs))
 print "struct PoLangEntry {\n";
 print "\tconst char *lang;\n";
 print "\tconst char *charset;\n";
+print "\tconst char *langname;\n";
 print "\tconst PoMessageEntry *msgs;\n";
 print "};\n\n";
 print "const PoLangEntry _translations[] = {\n";
 
 foreach my $l (keys(%msgs))
 {
+	# charset
 	$header = $msgs{$l}->{""};
 	$header =~ /charset=([^\\]+)/;
 	$charset = $1;
-	print "\t{ \"" . $l . "\", \"" . $charset . "\", _translation_${l} },\n";
+	# user readable language name
+	$lang = "NULL";
+	$header = $msgs{$l}->{""};
+	$header =~ /Language:[\s]*([^\\]*)/;
+	unless ($1 eq "")
+	{
+		$lang = "\"" . $1 . "\"";
+	}
+	print "\t{ \"" . $l . "\", \"" . $charset . "\", " . $lang . ", _translation_${l} },\n";
 }
 
-print "\t{ NULL, NULL, NULL }\n};\n\n";
+print "\t{ NULL, NULL, NULL, NULL }\n};\n\n";
 
 print "// code\n";
 print << 'EOF';
@@ -255,6 +265,13 @@ const char *po2c_getlang(const int num) {
 	assert(num < ARRAYSIZE(_translations));
 	return _translations[num].lang;
 }
+
+const char *po2c_getlangname(const int num) {
+	assert(num < ARRAYSIZE(_translations));
+	if (_translations[num].langname != NULL)
+		return _translations[num].langname;
+	return _translations[num].lang;
+}
 EOF
 
 exit 0;