Fix wrong mapping & update russian text