partial work on i18n
more partial work on i18n
more work on i18n
more work on i18n
more i18n organization
Merge pull request #375 from mfrederickson/master

i18n work for #365