GitLab

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"

(cherry picked from commit c21ed4ab)

(cherry picked from commit 2c1d63a1)

It is so far brought in implicitly by KConfigWidgets,
but missing when that is built without Auth support.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

(cherry picked from commit 4a17afc2)