Merge branch 'master' of /home/carl/git/dvdomatic

diff --combined src/tools/dvdomatic.cc
index d089750614fbcf23b4bf2a6ca9a4817f3dd311a7,230e02c88f8e2f8a587257c5bb77be7fe040fdd5..084e0fff73e2ac30f8133fade6ca445976ee350f
--- 1/src/tools/dvdomatic.cc
--- 2/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@@ -456,6 -456,9 +456,6 @@@ setup_i18n (
  #ifdef __WXGTK__
                locale->AddCatalogLookupPathPrefix (wxT (LOCALE_PREFIX "/locale"));
  #endif
 -#ifdef __WXMSW__
 -              locale->AddCatalogLookupPathPrefix (wxT ("../locale"));
 -#endif                
  
                locale->AddCatalog (wxT ("libdvdomatic-wx"));
                locale->AddCatalog (wxT ("dvdomatic"));
@@@ -479,12 -482,16 +479,16 @@@ class App : public wxAp
  #ifdef DVDOMATIC_POSIX                
                unsetenv ("UBUNTU_MENUPROXY");
  #endif                
-               
+ 
+               /* This needs to be before setup_i18n, as setup_i18n() will
+                  create a Config object, which needs Scalers to have
+                  been created.
+               */
+               dvdomatic_setup ();
+ 
                wxInitAllImageHandlers ();
                setup_i18n ();
                
-               dvdomatic_setup ();
- 
                if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
                        try {
                                film.reset (new Film (film_to_load));