GitLab

run tests successfully and send som mails by hand without segfaults.

MessageComopser::UtilTests and MessageCore::StringUtilTests depend on
MessageCoreSettings, that depends on ColorUtils that needs access to the
palette and this is in GUI depdendend. And this means it needs
QTEST_MAIN to run successfully.

CCMAIL: montel@kde.org

This reverts part of commit 5e2aafed.

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"