Finished (hopefully!) the i18n stuff