Libs/Resources: Refactoring and fixed some string patterns
Merge pull request #528 from z16/4.1

Libs/Resources: Refactoring and fixed some string patterns