Apply patch from https://phabricator.kde.org/T4889

FIXED-IN: 5.4.1
BUG: 365151

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"

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"

Fixes: Dependency freeze broken in messagelib

CCMAIL: aacid@kde.org

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"

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"

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"

Wenn we construct a signed message, we want to make sure, that the mail
itself is parsable for other MUAs, so we fix CE7Bit messages that contain
quoted-printable-like character when signing (1efea1c00df92e43d0ff66073851f48471d9d76b)
But this behaviour we only should do if it is text we sign and not a
mimestructure (multipart/mixed) already.

this makes it possible to build for kube.

CCMAIL: montel@kde.org

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"