I18n+

Coming from #2661.

@Changaco hopefully cbc8c0c is the state that you left this branch? Feel free to update it if not