r248: Moved i18n support into it's own files. Now supports setting the