Make recording-work add relationship edits auto-edits (MBS-7944)
Update normalise_strings, add more tests for it (fixes MBS-7953 and MBS-1444)
Use components/*-list.tt when displaying merge edits
Merge remote-tracking branch 'nikki-bitbucket/normalise_strings' into beta

* nikki-bitbucket/normalise_strings:
  Update normalise_strings, add more tests for it (fixes MBS-7953 and MBS-1444)
Merge remote-tracking branch 'nikki-bitbucket/templates-merging' into beta

* nikki-bitbucket/templates-merging:
  Use components/*-list.tt when displaying merge edits
Merge remote-tracking branch 'nikki-bitbucket/even-more-autoedits-2' into beta

* nikki-bitbucket/even-more-autoedits-2:
  Make recording-work add relationship edits auto-edits (MBS-7944)
Update .pot files.
Update translations from transifex.