CR changes: re-ordered messages in i18n file, added missing documentation
CR changes: messages key are now consistent