Clean merge errors

M lang/cs_CZ/lang.php
M templates/default/auth/login.tpl