More tweaks to 'dates', 'movements' & 'types' to allow for proper subtitling.
Merge branch 'develop'