From cc4a01433517b683ce9db7f912b269fcc9aa3eb3 Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Thu, 23 Sep 2010 10:39:59 +0000
Subject: COMMON : Initialize translation after system has been initialized (to
 be able to access system specific search paths for translations.dat)

svn-id: r52865
---
 base/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'base/main.cpp')

diff --git a/base/main.cpp b/base/main.cpp
index e651456ace..4858501126 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -321,9 +321,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	// Update the config file
 	ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
 
-	// Enable translation
-	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
-
 	// Load and setup the debuglevel and the debug flags. We do this at the
 	// soonest possible moment to ensure debug output starts early on, if
 	// requested.
@@ -365,6 +362,9 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 
 	setupGraphics(system);
 
+	// Enable translation
+	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
+
 	// Init the event manager. As the virtual keyboard is loaded here, it must
 	// take place after the backend is initiated and the screen has been setup
 	system.getEventManager()->init();
-- 
cgit v1.2.3


From b1f63deba3afe176646dbf9aae5c22cfab453785 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sat, 25 Sep 2010 22:47:00 +0000
Subject: GUI: Partial fix to bug #3075649 Fonts not found with buit-in theme

When the locale font are not found when loading the theme, it now
fallbacks to default language (i.e. English) and default font. For this to work
I had to move the TranslationManager initialization before the Theme is
loaded. Therefore it is now initialized when the GuiManager is constructed.

svn-id: r52896
---
 base/main.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'base/main.cpp')

diff --git a/base/main.cpp b/base/main.cpp
index 4858501126..dff9a0d564 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -362,9 +362,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 
 	setupGraphics(system);
 
-	// Enable translation
-	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
-
 	// Init the event manager. As the virtual keyboard is loaded here, it must
 	// take place after the backend is initiated and the screen has been setup
 	system.getEventManager()->init();
-- 
cgit v1.2.3


From c975ed11a14a78bfbf6aa0442058a8f19d470c6c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 24 Oct 2010 13:04:33 +0000
Subject: ALL: Fix various typos (patch #3093266)

svn-id: r53762
---
 base/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'base/main.cpp')

diff --git a/base/main.cpp b/base/main.cpp
index dff9a0d564..a44f7a337a 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -310,7 +310,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	Common::StringMap settings;
 	command = Base::parseCommandLine(settings, argc, argv);
 
-	// Load the config file (possibly overriden via command line):
+	// Load the config file (possibly overridden via command line):
 	if (settings.contains("config")) {
 		ConfMan.loadConfigFile(settings["config"]);
 		settings.erase("config");
-- 
cgit v1.2.3


From 4e2d1b507a395c6dc618af38711e30bd89a91b00 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 26 Oct 2010 22:30:39 +0000
Subject: BASE: Remove oudated comment, and redundant warning

svn-id: r53867
---
 base/main.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'base/main.cpp')

diff --git a/base/main.cpp b/base/main.cpp
index a44f7a337a..8d46cf9a56 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -422,9 +422,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 			// PluginManager::instance().unloadPlugins();
 			PluginManager::instance().loadPlugins();
 		} else {
-			// A dialog would be nicer, but we don't have any
-			// screen to draw on yet.
-			warning("%s", _("Could not find any engine capable of running the selected game"));
 			GUI::displayErrorDialog(_("Could not find any engine capable of running the selected game"));
 		}
 
-- 
cgit v1.2.3