Add changelog entry for previous release.
Improve `trmerge` command.

- Add `--ignore-extra` option.  This ignores extra msgids in the
  second po-file.

- Add `--no-override` argument.  This means: do not override
  translations, only add missing translations.

- Do not override when the mixin translation is fuzzy.