merged and updated translations