I18n again

Merge i18n fixes that were incorporated into master into the 0.2 branch.