Merge branch 'master' into i18n

diff --combined src/lib/film.cc
index 77f61cbac58c9817b75fa467042756016058f68b,1cf161259a92e6f5e66b8f4128af396e2a7f9886..600cdfa02165c0ac5da089ceeea67e5dbd75359d
--- 1/src/lib/film.cc
--- 2/src/lib/film.cc
+++ b/src/lib/film.cc
@@@ -237,16 -237,14 +237,14 @@@ Film::video_mxf_filename () cons
        return video_state_identifier() + ".mxf";
  }
  
- /** Add suitable Jobs to the JobManager to create a DCP for this Film.
-  *  @param true to transcode, false to use the WAV and J2K files that are already there.
-  */
+ /** Add suitable Jobs to the JobManager to create a DCP for this Film */
  void
- Film::make_dcp (bool transcode)
+ Film::make_dcp ()
  {
        set_dci_date_today ();
        
        if (dcp_name().find ("/") != string::npos) {
 -              throw BadSettingError ("name", "cannot contain slashes");
 +              throw BadSettingError ("name", _("cannot contain slashes"));
        }
        
        log()->log (String::compose ("DVD-o-matic %1 git %2 using %3", dvdomatic_version, dvdomatic_git_commit, dependency_version_summary()));
@@@ -298,12 -296,10 +296,10 @@@
  
        shared_ptr<Job> r;
  
-       if (transcode) {
-               if (dcp_ab()) {
-                       r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this(), od)));
-               } else {
-                       r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this(), od)));
-               }
+       if (dcp_ab()) {
+               r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this(), od)));
+       } else {
+               r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this(), od)));
        }
  }
  

diff --combined wscript
index 1a8238d1c53078e18ba7a7a06f56e23838188289,e2706cf9d36e44f045f874ccc368637b940dbc3f..cce8c240e57aa93770de6893f7f500d0cc447e33
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -3,7 -3,7 +3,7 @@@ import o
  import sys
  
  APPNAME = 'dvdomatic'
- VERSION = '0.73pre'
+ VERSION = '0.74pre'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -253,6 -253,3 +253,6 @@@ def create_version_cc(version)
  def post(ctx):
      if ctx.cmd == 'install':
          ctx.exec_command('/sbin/ldconfig')
 +
 +def pot(bld):
 +    bld.recurse('src')