GitLab

Now that Prison supports binary content properly, we can also pass binary
data along properly rather than hoping it survives a QString encoding
roundtrip.

Adapt to the plugin system change

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"

The removal of this in commit 95186ed5
breaks the configuration page in Plasma's Digital Clock settings.

BUG: 440449