Merge.

diff --combined ChangeLog
index 539bef4670f90a0acbd36d6a35f23ab92419abd3,fef8bbf740a87e0db77e7359f9966b4d8518b8c0..487f8de6deaa816d050840b5f419bf507cb6a219
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,23 +1,27 @@@
 +2016-01-06  c.hetherington  <cth@carlh.net>
 +
 +      * New sk_SK translation from Tomáš Hlaváč.
 +
+ 2015-12-23  Carl Hetherington  <cth@carlh.net>
+ 
+       * Add basic search function to KDM creator screens list (#739).
+ 
+       * Version 2.6.10 released.
+ 
+ 2015-12-23  Carl Hetherington  <cth@carlh.net>
+ 
+       * Updated nl_NL translation from Rob van Nieuwkerk.
+ 
+       * Version 2.6.9 released.
+ 
+ 2015-12-23  Carl Hetherington  <cth@carlh.net>
+ 
+       * Add stored list of DKDMs to KDM creator (#767).
+ 
+ 2015-12-22  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix hang when removing screens in some cases.
+ 
  2015-12-21  Carl Hetherington  <cth@carlh.net>
  
        * Version 2.6.8 released.

diff --combined cscript
index b44ce40ba0ad7c24cc345f11788bb9cc5523b52b,c25a68e59d527440f11c8805e3aef317c68bc55c..e321af3dc23d0c6b955fd86a9b7ff173b47bc425
--- 1/cscript
--- 2/cscript
+++ b/cscript
@@@ -242,7 -242,7 +242,7 @@@ def make_spec(filename, version, target
          print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r
          print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r
          print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r
 -    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT']:
 +    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'sk_SK']:
          print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l
          print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l
          print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l
@@@ -278,9 -278,9 +278,9 @@@ def dependencies(target)
      else:
          ffmpeg_options = {}
  
-     return (('ffmpeg-cdist', '0e31e4b', ffmpeg_options),
-             ('libdcp', 'fb03c08'),
-             ('libsub', 'f368daf'))
+     return (('ffmpeg-cdist', 'b559555', ffmpeg_options),
+             ('libdcp', '2a4eb72'),
+             ('libsub', '4e6d9c9'))
  
  def configure_options(target):
      opt = ''

diff --combined src/wx/about_dialog.cc
index e36d618a4f4bd8eb82d1ade5109a42ac2a48b0f9,20a912da40e39be3afe6421f89d9eebb6d8cbdd9..aa05076c1d8afb7f5b40965fff984f93a33de8a5
--- 1/src/wx/about_dialog.cc
--- 2/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@@ -1,5 -1,5 +1,5 @@@
  /*
-     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
  
      This program is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
@@@ -79,7 -79,7 +79,7 @@@ AboutDialog::AboutDialog (wxWindow* par
  
        t = new wxStaticText (
                this, wxID_ANY,
-               _("(C) 2012-2015 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
+               _("(C) 2012-2016 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
                wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
                );
  
@@@ -103,20 -103,20 +103,21 @@@
        translated_by.Add (wxT ("Massimiliano Broggi"));
        translated_by.Add (wxT ("Davide Dall'AraCiao"));
        translated_by.Add (wxT ("William Fanelli"));
 +      translated_by.Add (wxT ("Tomáš Hlaváč"));
        translated_by.Add (wxT ("Thierry Journet"));
        translated_by.Add (wxT ("Adam Klotblixt"));
        translated_by.Add (wxT ("Theo Kooijmans"));
        translated_by.Add (wxT ("Carsten Kurz"));
        translated_by.Add (wxT ("Lilian Lefranc"));
        translated_by.Add (wxT ("Gérald Maruccia"));
-       translated_by.Add (wxT ("Rob van Nieuwkerk"));
        translated_by.Add (wxT ("Anders Uhl Pedersen"));
        translated_by.Add (wxT ("Olivier Perriere"));
        translated_by.Add (wxT ("Markus Raab"));
+       translated_by.Add (wxT ("Tiago Casal Ribeiro"));
        translated_by.Add (wxT ("Davide Sanvito"));
        translated_by.Add (wxT ("Marek Skrzelowski"));
        translated_by.Add (wxT ("Igor Voytovich"));
+       translated_by.Add (wxT ("Rob van Nieuwkerk"));
        add_section (_("Translated by"), translated_by);
  
        wxArrayString with_help_from;
@@@ -132,8 -132,8 +133,8 @@@
        supported_by.Add (wxT ("Eric Audurier"));
        supported_by.Add (wxT ("Louis Belloisy"));
        supported_by.Add (wxT ("Mike Blakesley"));
-       supported_by.Add (wxT ("Jeff Boot"));
        supported_by.Add (wxT ("Silvio Bonomi"));
+       supported_by.Add (wxT ("Jeff Boot"));
        supported_by.Add (wxT ("Kieran Carroll"));
        supported_by.Add (wxT ("Matt Carter"));
        supported_by.Add (wxT ("Frank Cianciolo"));
@@@ -164,6 -164,7 +165,7 @@@
        supported_by.Add (wxT ("Chris Kay"));
        supported_by.Add (wxT ("Lars Kelto"));
        supported_by.Add (wxT ("Erwan Kerzanet"));
+       supported_by.Add (wxT ("Kert Kiima"));
        supported_by.Add (wxT ("Adam Klotblixt"));
        supported_by.Add (wxT ("Filip Kovcin"));
        supported_by.Add (wxT ("Cihan Kulaber"));
@@@ -183,6 -184,7 +185,7 @@@
        supported_by.Add (wxT ("Howard Molton"));
        supported_by.Add (wxT ("Lindsay Morris"));
        supported_by.Add (wxT ("David Nedrow"));
+       supported_by.Add (wxT ("Casablanca Nuernberg"));
        supported_by.Add (wxT ("Tim O'Brien"));
        supported_by.Add (wxT ("Jerome Cohen Olivar"));
        supported_by.Add (wxT ("Kevin Orman"));
@@@ -205,6 -207,7 +208,7 @@@
        supported_by.Add (wxT ("Raoul Walzer"));
        supported_by.Add (wxT ("Wolfram Weber"));
        supported_by.Add (wxT ("Frank Wenz"));
+       supported_by.Add (wxT ("Anja Wenz"));
        supported_by.Add (wxT ("Johannes Wilbrand"));
        supported_by.Add (wxT ("Roland Wirtz"));
        supported_by.Add (wxT ("Wolfgang Woehl"));
@@@ -212,6 -215,7 +216,7 @@@
        supported_by.Add (wxT ("Pavel Zhdanko"));
        supported_by.Add (wxT ("Cinéma de la Neuveville"));
        supported_by.Add (wxT ("Frechen-Film e.V."));
+       supported_by.Add (wxT ("Mobiles Kino e.V."));
        supported_by.Add (wxT ("Daniel Židek"));
        supported_by.Add (wxT ("Гуляев Михаил"));
        add_section (_("Supported by"), supported_by);