Internationalization
Merge pull request #889 from delving/13.04-I18N

Internationalization