Fix i18n extract/update issues

Fixes RM-2770