Conflicts: include/config.php update.php
generalise publish option template - so once translated we can merge them all. Update strings.