CORE-1848: More I18N string organization