Entity translation integration

When terms are translated using Entity Translation (vocabulary translation mode set to "Localize. Terms are common for all languages, but their name and description may be localized.") , Taxonomy Block doesn't get the translated titles and descriptions. Also, i don't understand why the module resorts the names, if the terms have to be sorted by weight.

I've put the status in "Needs review" because i'm pretty sure that i have to care about the translation method of the vocabulary, but i'm a little lost in the entire i18n jungle. If an expert could review and correct my patch... it would be great :)

The patch works for my vocabulary configuration and terms translated using entity translation, but i don't know if it's the best method to fix the problem.