Merge master.

diff --combined ChangeLog
index fce782d7a9f6a54b70488b0b59f29950440b9ef4,82ee2675e5288050400adcd05e3ba41c3e91c2d0..0d2b89a59f4a49813c5a23974035afc780535f93
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,37 -1,12 +1,41 @@@
- 2014-10-05  Carl Hetherington  <cth@carlh.net>
+ 2014-10-14  Carl Hetherington  <cth@carlh.net>
  
-       * Use a more sensible default position and size for
-       .srt subs.
+       * Version 1.74.3 released.
  
  2014-10-08  c.hetherington  <cth@carlh.net>
  
        * Make server finding more reliable when
        there are more than a few servers.
  
++2014-10-05  Carl Hetherington  <cth@carlh.net>
++
++      * Use a more sensible default position and size for
++      .srt subs.
++
 +2014-10-03  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.14 released.
 +
 +2014-10-01  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.13 released.
 +
 +2014-09-30  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.12 released.
 +
 +2014-09-30  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add basic video fade in/out.
 +
 +2014-09-22  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.11 released.
 +
 +2014-09-18  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.10 released.
 +
  2014-10-08  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.74.2 released.
@@@ -82,19 -57,6 +86,19 @@@
  
  2014-09-12  Carl Hetherington  <cth@carlh.net>
  
 +      * Version 2.0.9 released.
 +
 +2014-09-12  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add "re-examine" option to content context menu (#339).
 +
 +2014-09-11  Carl Hetherington  <cth@carlh.net>
 +
 +      * Restore encoding optimisations for still-image sources.
 +
 +      * Add option to re-make signing chain with specified organisation,
 +      common names etc. (#354)
 +
        * Allow separate X and Y scale for subtitles (#337).
  
  2014-09-10  Carl Hetherington  <cth@carlh.net>
@@@ -104,38 -66,17 +108,38 @@@
  
        * Fix hidden advanced preferences button in some locales.
  
 -2014-09-08  Carl Hetherington  <cth@carlh.net>
 +      * Version 2.0.8 released.
 +
 +2014-09-10  Carl Hetherington  <cth@carlh.net>
 +
 +      * Fix loading of 1.x films.
 +
 +      * Fix crash on audio analysis in some cases.
  
 -      * Version 1.73.4 released.
 +2014-09-09  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.7 released.
 +
 +2014-09-09  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.6 released.
 +
 +2014-09-09  Carl Hetherington  <cth@carlh.net>
 +
 +      * Fix missing OS X dependencies.
 +
 +      * Use a different directory for DCP-o-matic 2
 +      configuration (not the same as 1.x).
  
  2014-09-08  Carl Hetherington  <cth@carlh.net>
  
 -      * Fix failure to load Targa files.
 +      * Version 2.0.5 released.
  
 -2014-09-07  Carl Hetherington  <cth@carlh.net>
 +      * Fix hidden advanced preferences button in some locales.
 +
 +2014-09-08  Carl Hetherington  <cth@carlh.net>
  
 -      * Version 1.73.3 released.
 +      * Fix failure to load Targa files.
  
  2014-09-07  Carl Hetherington  <cth@carlh.net>
  
@@@ -144,6 -85,10 +148,6 @@@
  
        * Fix a few bad fuzzy translations from the preferences dialog.
  
 -2014-09-03  Carl Hetherington  <cth@carlh.net>
 -
 -      * Version 1.73.2 released.
 -
  2014-09-03  Carl Hetherington  <cth@carlh.net>
  
        * Fix server certificate downloads on OS X (#376).
@@@ -172,33 -117,6 +176,33 @@@
  
  2014-08-29  Carl Hetherington  <cth@carlh.net>
  
 +      * Version 2.0.4 released.
 +
 +2014-08-24  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.3 released.
 +
 +2014-08-24  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.2 released.
 +
 +2014-08-06  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 2.0.1 released.
 +
 +2014-07-15  Carl Hetherington  <cth@carlh.net>
 +
 +      * A variety of changes were made on the 2.0 branch
 +      but not documented in the ChangeLog.  Most sigificantly:
 +
 +      - DCP import
 +      - Creation of DCPs with proper XML subtitles
 +      - Import of .srt and .xml subtitles
 +      - Audio processing framework (with some basic processors).
 +
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
        * Some improvements to the manual.
  
  2014-08-26  Carl Hetherington  <cth@carlh.net>
@@@ -229,7 -147,6 +233,7 @@@
        * Attempt to fix random crashes on OS X (especially during encodes)
        thought to be caused by multiple threads using (different) stringstreams
        at the same time; see src/lib/safe_stringstream.
 +>>>>>>> origin/master
  
  2014-08-09  Carl Hetherington  <cth@carlh.net>
  
@@@ -294,7 -211,6 +298,7 @@@
  2014-07-10  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.72.2 released.
 +>>>>>>> origin/master
  
  2014-07-10  Carl Hetherington  <cth@carlh.net>
  

diff --combined debian/changelog
index 67dbff2a4d0eeb010a69deb5c741570f948e1762,efd8fd73d4432fd303580e0b94bbfc7df631578b..526cae29f07b089ed28a21be132cc2a5ee1f0b50
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
 -dcpomatic (1.74.3-1) UNRELEASED; urgency=low
 +dcpomatic (2.0.14-1) UNRELEASED; urgency=low
  
    * New upstream release.
    * New upstream release.
@@@ -188,8 -188,9 +188,9 @@@
    * New upstream release.
    * New upstream release.
    * New upstream release.
+   * New upstream release.
  
-  -- Carl Hetherington <carl@d1stkfactory>  Wed, 08 Oct 2014 10:37:21 +0100
+  -- Carl Hetherington <carl@d1stkfactory>  Tue, 14 Oct 2014 18:38:17 +0100
  
  dcpomatic (0.87-1) UNRELEASED; urgency=low
  

diff --combined src/wx/wx_util.cc
index 003cc222f13ff400b1a64d4f4a06e112ee52a25a,7f15217f14a65490345aacf3a4b81551de8f892c..c4a7fd5bca9f071b5da875d7a476d0c7d8ce2962
--- 1/src/wx/wx_util.cc
--- 2/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@@ -123,7 -123,7 +123,7 @@@ int const ThreadedStaticText::_update_e
   *  @param initial Initial text for the wxStaticText while the computation is being run.
   *  @param fn Function which works out what the wxStaticText content should be and returns it.
   */
 -ThreadedStaticText::ThreadedStaticText (wxWindow* parent, wxString initial, function<string ()> fn)
 +ThreadedStaticText::ThreadedStaticText (wxWindow* parent, wxString initial, boost::function<string ()> fn)
        : wxStaticText (parent, wxID_ANY, initial)
  {
        Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ThreadedStaticText::thread_finished, this, _1), _update_event_id);
@@@ -139,7 -139,7 +139,7 @@@ ThreadedStaticText::~ThreadedStaticTex
  
  /** Run our thread and post the result to the GUI thread via AddPendingEvent */
  void
 -ThreadedStaticText::run (function<string ()> fn)
 +ThreadedStaticText::run (boost::function<string ()> fn)
  try
  {
        wxCommandEvent ev (wxEVT_COMMAND_TEXT_UPDATED, _update_event_id);
@@@ -280,6 -280,14 +280,14 @@@ dcpomatic_setup_i18n (
                locale->AddCatalogLookupPathPrefix (POSIX_LOCALE_PREFIX);
  #endif
  
+ #ifdef DCPOMATIC_LINUX
+               /* We have to include the wxWidgets .mo in our distribution,
+                  so we rename it to avoid clashes with any other installation
+                  of wxWidgets.
+               */
+               locale->AddCatalog (wxT ("dcpomatic-wxstd"));
+ #endif                
+               
                locale->AddCatalog (wxT ("libdcpomatic-wx"));
                locale->AddCatalog (wxT ("dcpomatic"));