Fixes for language translations. Issue #603.