Fix and improve translation strings (#2471)