Cleaned templates and added missing string to translatable strings
Updated english static locales with new strings
Resolved conflicts for results template