We tell MSVC that our source is UTF-8, but this file really is Latin-9. Chaos ensues.

Convert the file to UTF-8 using 'iconv -f ISO_8859-15 -t UTF-8 termgeneratortest.cpp' and adjust the code accordingly.

This fixes the build with MSVC.

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

GIT_SILENT