Merge master.

[dcpomatic.git] / src / tools / dvdomatic.cc

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index f6dc587c96768268e00ca0bf50e42d446df7d595..a0e7f0de85e2f0f1f1b73487eaf8bcc742406715 100644 (file)
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -236,9 +236,6 @@ public:
 
                set_menu_sensitivity ();
 
-               /* XXX: calling these here is a bit of a hack */
-               film_editor->setup_visibility ();
-               
                film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1));
                if (film) {
                        file_changed (film->directory ());
@@ -284,7 +281,7 @@ private:
        void file_changed (string f)
        {
                stringstream s;
-               s << _("DVD-o-matic");
+               s << wx_to_std (_("DVD-o-matic"));
                if (!f.empty ()) {
                        s << " - " << f;
                }
@@ -328,7 +325,7 @@ private:
                        } catch (std::exception& e) {
                                wxString p = c->GetPath ();
                                wxCharBuffer b = p.ToUTF8 ();
-                               error_dialog (this, std_to_wx (String::compose (wx_to_std (_("Could not open film at %1 (%2)")), wx_to_std (p), e.what())));
+                               error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data()));
                        }
                }
 
@@ -421,6 +418,7 @@ private:
                translators.Add (wxT ("Thierry Journet"));
                translators.Add (wxT ("Massimiliano Broggi"));
                translators.Add (wxT ("Manuel AC"));
+               translators.Add (wxT ("Adam Klotblixt"));
                info.SetTranslators (translators);
                
                info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic"));
@@ -451,7 +449,9 @@ setup_i18n ()
 
        if (Config::instance()->language()) {
                wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (Config::instance()->language().get()));
-               language = li->Language;
+               if (li) {
+                       language = li->Language;
+               }
        }
  
        if (wxLocale::IsAvailable (language)) {