Refactorización de claves i18n, parte 2
Merge origin/develop into develop