use custom i18n system (Ressource bundle are not implemented on Android and Html)
Merge origin/master