Merge master.

diff --cc ChangeLog
index 980bfba88561e77a83335562cddb0955619f9a09,a529f6a810154307fe5ff0f342704b355c2bcdb0..89185d4e62fca3f08dab100a666b55988d9156e1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -25,20 -8,12 +25,14 @@@
  
  2014-09-08  Carl Hetherington  <cth@carlh.net>
  
 -      * Fix failure to load Targa files.
 +      * Version 2.0.5 released.
  
- 2014-09-08  Carl Hetherington  <cth@carlh.net>
- 
-       * Version 1.73.4 released.
 -2014-09-07  Carl Hetherington  <cth@carlh.net>
++      * Fix hidden advanced preferences button in some locales.
  
 -      * Version 1.73.3 released.
 +2014-09-08  Carl Hetherington  <cth@carlh.net>
 +
 +      * Fix failure to load Targa files.
  
- 2014-09-07  Carl Hetherington  <cth@carlh.net>
- 
-       * Version 1.73.3 released.
- 
  2014-09-07  Carl Hetherington  <cth@carlh.net>
  
        * Put no stretch / no scale in the set of choices for default
@@@ -46,10 -21,10 +40,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).

diff --cc run/dcpomatic
Simple merge

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