translation + fixes

translation + fixes