Fix i18n
Preparing release 1.36
Back to development: 1.37