Marked string as NON-NLS
Merge pull request #708 from mrtizmo/datamodel

Marked string as NON-NLS