fixes #2600 - more CR form i18n extraction