Merge.

diff --cc ChangeLog
index 029066de3641f079c62f562dd19c46279b390153,157436ae9e404890634a429c06045e6e2ba94d54..97cb25bed2415e8625e8e460cb06edb8a4507463
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,9 @@@
  2018-02-01  Carl Hetherington  <cth@carlh.net>
 +
 +      * Don't try to use video streams for which we have no codec (#1184).
  
+       * Updated sv_SE translation from Adam Klotblixt.
+ 
        * Updated nl_NL translation from Rob van Nieuwkerk.
  
        * Version 2.11.47 released.