Merge master.

diff --cc ChangeLog
index 28cd9b332436f39c1d417a90c2b2a973fbd2fa1f,de702dacf571603cbf6d457285a0748d3e9da725..c2439f80742ebb65e023a5420aa96f5215b04518
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,29 +1,33 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
+ 2014-06-21  Carl Hetherington  <cth@carlh.net>
+ 
+       * Move email config into the KDM email page.
+ 
+       * Version 1.69.34 released.
+ 
+ 2014-06-21  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.33 released.
+ 
+ 2014-06-21  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.32 released.
+ 
+ 2014-06-21  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.31 released.
+ 
+ 2014-06-20  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.30 released.
+ 
+ 2014-06-20  Carl Hetherington  <cth@carlh.net>
+ 
+       * Updates to de_DE translation from Carsten Kurz.
+ 
  2014-06-18  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.69.29 released.

diff --cc cscript
index adc4da639a2be9ad4e3ca8e7e093f5b9b38604ba,9a576c2f46e8c76cb7dcb79cedf361317101ea76..f3757fa4ad750f2fa0740bb1bd7040ac04c818a3
--- 1/cscript
--- 2/cscript
+++ b/cscript
@@@ -141,8 -141,8 +141,8 @@@ def make_control(debian_version, bits, 
          print >>f,''
  
  def dependencies(target):
-     return (('ffmpeg-cdist', 'bba68a5'),
+     return (('ffmpeg-cdist', '67dc770'),
 -            ('libdcp', 'v0.95.0'))
 +            ('libdcp', '1.0'))
  
  def build(target, options):
      cmd = './waf configure --prefix=%s' % target.work_dir_cscript()

diff --cc src/wx/about_dialog.cc
Simple merge

diff --cc src/wx/audio_panel.cc
Simple merge

diff --cc src/wx/config_dialog.cc
Simple merge

diff --cc src/wx/screen_dialog.cc
index 0d46a46ec215dfc5f7de8cdaf89821d955bf3fe2,c6991271675f3321e82886478fbad2a879bff1ea..6b58145eb367737c6bf6317f8b4b7d368bf43b8f
--- 1/src/wx/screen_dialog.cc
--- 2/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@@ -89,10 -89,10 +89,10 @@@ voi
  ScreenDialog::load_certificate (boost::filesystem::path file)
  {
        try {
 -              _certificate.reset (new libdcp::Certificate (file));
 +              _certificate.reset (new dcp::Certificate (file));
                _certificate_text->SetValue (_certificate->certificate ());
 -      } catch (libdcp::MiscError& e) {
 +      } catch (dcp::MiscError& e) {
-               error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
+               error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), e.what()));
        }
  }
  

diff --cc src/wx/timing_panel.cc
Simple merge

diff --cc src/wx/wx_util.cc
Simple merge

diff --cc wscript
Simple merge