Translation cleanup

fixes #365 

@danimo @dragotin