Fixed MSVC problems
Removed duplicate key in en.xml
fixed approval bug
follow up
fixed cmake