Feature/l10n fixes

Fixes https://github.com/openlabs/nereid/issues/197