Merge proposals

subtitleeditor has no merge proposals.