Merge branch 'es/sh-i18n-envsubst'