I18n more fixes on i18n branch

(sorry, I don't know how to pull request onto your i18n branch, this seems to compare to yourcelf:master)