use blocktrans trimmed to have better template formatting, simplify blocktrans to trans at some places
update i18n (.po)
update i18n (.mo)