(cherry picked from commit cbbc9cf7)

In KF we already looking for 5.15.2
and looking something lower than that
is a bit meaningless

(cherry picked from commit dba6a4d0)

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"

(cherry picked from commit 4f77242f)

(cherry picked from commit 74b457cf)

(cherry picked from commit 79aed34b)

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"

(cherry picked from commit 607cb753)

GIT_SILENT

(cherry picked from commit 7075514d)

Avoids clashes with home-grown unnamedspace ones, and means being a
good system citizen :)