Translation updates

Merging in Franklin's updates.