Fixed few translation issues