Index: strings.c
===================================================================
--- strings.c	(revision 2761)
+++ strings.c	(working copy)
@@ -12,9 +12,13 @@
 #include "vehicle.h"
 #include "news.h"
 #include "screenshot.h"
+<<<<<<< .mine
+#include "fonts.h"
+=======
 #include "waypoint.h"
 #include "industry.h"
 #include "variables.h"
+>>>>>>> .r2761
 
 char _userstring[128];
 
@@ -31,7 +35,14 @@
 	uint32 version;			// 32-bits of auto generated version info which is basically a hash of strings.h
 	char name[32];			// the international name of this language
 	char own_name[32];	// the localized name of this language
+<<<<<<< .mine
+	char reload_fonts;	// reload fonts on pack selection (useful for CJK glyph selection)
+	char small_font_name[32];	// the filename of the small font
+	char medium_font_name[32];	// the filename of the medium font
+	char large_font_name[32];	// the filename of the large font
+=======
 	char isocode[16];	// the ISO code for the language (not country code)
+>>>>>>> .r2761
 	uint16 offsets[32];	// the offsets
 	byte plural_form;		// how to compute plural forms
 	byte pad[3];				// pad header to be a multiple of 4
@@ -1035,7 +1046,25 @@
 		free(lang_pack);
 		return false;
 	}
+<<<<<<< .mine
 
+	if (HDR->reload_fonts)
+	{
+		err = ReloadFont(&small_font, HDR->small_font_name);
+		if(!err)
+			ShowInfoF("Fonts: Small Font '%s' for '%s' could not be reloaded.", HDR->small_font_name, HDR->name);
+		err = ReloadFont(&medium_font, HDR->medium_font_name);
+		if(!err)
+			ShowInfoF("Fonts: Medium Font '%s' for '%s' could not be reloaded.", HDR->medium_font_name, HDR->name);
+		err = ReloadFont(&large_font, HDR->large_font_name);
+		if(!err)
+			ShowInfoF("Fonts: Large Font '%s' for '%s' could not be reloaded.", HDR->large_font_name, HDR->name);
+	}
+
+#undef HDR
+=======
+>>>>>>> .r2761
+
 #if defined(TTD_BIG_ENDIAN)
 	for (i = 0; i != 32; i++) {
 		lang_pack->offsets[i] = READ_LE_UINT16(&lang_pack->offsets[i]);
@@ -1080,11 +1109,16 @@
 void InitializeLanguagePacks(void)
 {
 	DynamicLanguages *dl = &_dynlang;
+<<<<<<< .mine
+	int i, j, n, m,def, err;
+	LanguagePackHeader hdr;
+=======
 	int i;
 	int n;
 	int m;
 	int def;
 	LanguagePack hdr;
+>>>>>>> .r2761
 	FILE *in;
 	char *files[32];
 
@@ -1109,6 +1143,15 @@
 
 		dl->ent[m].file = files[i];
 		dl->ent[m].name = strdup(hdr.name);
+		err = LoadFont(&small_font, hdr.small_font_name);
+		if(!err)
+			ShowInfoF("Fonts: Small Font '%s' for '%s' could not be read.", hdr.small_font_name, hdr.name);
+		err = LoadFont(&medium_font, hdr.medium_font_name);
+		if(!err)
+			ShowInfoF("Fonts: Medium Font '%s' for '%s' could not be read.", hdr.medium_font_name, hdr.name);
+		err = LoadFont(&large_font, hdr.large_font_name);
+		if(!err)
+			ShowInfoF("Fonts: Large Font '%s' for '%s' could not be read.", hdr.large_font_name, hdr.name);
 
 		if (strcmp(hdr.name, "English") == 0) def = m;
 
Index: Makefile
===================================================================
--- Makefile	(revision 2761)
+++ Makefile	(working copy)
@@ -649,6 +649,7 @@
 C_SOURCES += roadveh_gui.c
 C_SOURCES += saveload.c
 C_SOURCES += screenshot.c
+C_SOURCES += sdl_bdf.c
 C_SOURCES += settings.c
 C_SOURCES += settings_gui.c
 C_SOURCES += ship_cmd.c