Czech update for sprint 36

Supersedes #6806, with fixes suggested by @martinstarman.