CORE-1848: Organizing app labels
CORE-1848: More I18N string organization