The buddylist, almost more than any other module, has a lot of text that the admin wants to modify. Are they buddies, friends or contacts? What do the messages say when someone is added or taken off from the list? What do the mails say? To me, this is exactly what the token module was written to handle. My proposal is to make a real release with the buddylist 5.1 branch, as it is now, and then delegate all token handling functionality to the token module for a 5.2 branch.