Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --cc ChangeLog
index 186d614de238c2017fc16c215a7056f7122c163d,aff3175a15004ac8a070da4154271fe880badd6a..4d3741eebb4d4968ce05e2a5d831232b3c86ad7f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,11 @@@
+ 2018-05-29  Carl Hetherington  <cth@carlh.net>
+ 
+       * Updated fr_FR translation from Thierry Journet.
+ 
  2018-05-27  Carl Hetherington  <cth@carlh.net>
  
 +      * Support notifications on jobs finishing (#1286).
 +
        * Updated it_IT translation from Felice D'Andrea.
  
  2018-05-23  Carl Hetherington  <cth@carlh.net>