Merge master.

diff --combined ChangeLog
index 12d262f4b595944f1ba520248f0aa9335915ba0f,c4e689b64cec4494aa47339e32dc7a0edd416980..b59b94c8cd70913d8a74bef9cb93ea8cdef3d621
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
+ 2014-07-02  Carl Hetherington  <cth@carlh.net>
+ 
+       * Updated de_DE translation from Carsten Kurz.
+ 
  2014-06-30  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.72.0 released.