Ned/i18n for wiki

(includes #2485)