Merged in xavismeh's translation changes