Adding some missing I18n annotations.
Merge branch 'i18n' into develop