small tranlation changes
merge all versions