core-4903 externalize strings for folder link
core-4903 externalize strings
core-4914 add logic to differentiate filter files/ folders
core-4868 externalize strings
Merge branch 'master' into STABLE