Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calcu...

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

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 614073947b4032e305ef26a0a2e90c1879f740a5..e929f185d1fa75e4339d4dbaff7f92dbf943f5b8 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -810,7 +810,7 @@ class App : public wxApp
                if (!_film_to_create.empty ()) {
                        _frame->new_film (_film_to_create);
                        if (!_content_to_add.empty ()) {
-                               _frame->film()->examine_and_add_content (content_factory (_frame->film(), _content_to_add), true);
+                               _frame->film()->examine_and_add_content (content_factory (_frame->film(), _content_to_add));
                        }
                }
 
@@ -903,7 +903,7 @@ class App : public wxApp
                        dialog->Destroy ();
                } else if (uc->state() == UpdateChecker::FAILED) {
                        if (!UpdateChecker::instance()->last_emit_was_first ()) {
-                               error_dialog (_frame, _("The DCP-o-matic download server could not be contaced."));
+                               error_dialog (_frame, _("The DCP-o-matic download server could not be contacted."));
                        }
                } else {
                        if (!UpdateChecker::instance()->last_emit_was_first ()) {