Merged i18n and i18n_plugin files and fixed comment wrapping.