From: Carl Hetherington <cth@carlh.net>
Date: Sun, 22 Jun 2014 20:11:18 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~779
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f0edd6ab35c3c2b7800a26ec8206adab75e5f633

Merge master.
---

f0edd6ab35c3c2b7800a26ec8206adab75e5f633
diff --cc ChangeLog
index 28cd9b332,de702dacf..c2439f807
--- a/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 adc4da639,9a576c2f4..f3757fa4a
--- a/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/screen_dialog.cc
index 0d46a46ec,c69912716..6b58145eb
--- a/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()));
  	}
  }