Clean up #include
Replace placeholders even if the string is not in the language content

Fix #2044
Test case for #2044
Updated CHANGELOG
Bug fixes
Fix build generator
Regenerated build/
Bug fixes for clang
Regenerated build/
Cosmetic code fix
Merge pull request #2080 from sjinks/issue-2044

Replace placeholders even if the string is not in the language content