WIP: Filling i18n gaps

This is work in progress and works on finishing up issue #436