Merge.

diff --cc ChangeLog
index b8ff404f52d4c84b3a00bd4ae1dc4aaa68c548c0,2655c4889087172755f355ec62aa54f89b758f04..f9433517e444d0280c012e001ef96f7d0cff4c69
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,9 @@@
  2018-01-15  Carl Hetherington  <cth@carlh.net>
  
 +      * Updated pt_BR translation from Max Fuhlendorf.
 +
+       * Version 2.11.42 released.
+ 
  2018-01-14  Carl Hetherington  <cth@carlh.net>
  
        * Updated nl_NL translation from Rob van Nieuwkerk.