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 3bf2b38c)

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 02b62701)

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 f0120487)

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 24658242)

Deleting an object from a slot connected to one of its signals
is a very dangerous thing to do, a recipe for crashes.
Jobs autodelete themselves, so we can just let it do that.

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

Otherwise things like
Àrab
get sorted at the end instead with the rest of names that start with A

kf5_all_languages is part of kdelibs4support and will eventually disappear

(cherry picked from commit 81c25b31)

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 ed93bc4e)

(cherry picked from commit a300ca66)