A couple more fixes for the translations. There are still several bugs
left, mostly related to version control.