Use correct i18n branch
Improve error messages for upload