GitLab

GIT_SILENT

(cherry picked from commit 21d90524)

(cherry picked from commit 9c40d9c7)

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

BUGS: 450841

(cherry picked from commit 97d48fdd)

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 8a5c0ed0)

BUGS: 448346

(cherry picked from commit 77cc2f1c)

When using the disc cache strategy, resizing a KPat window
is horrifically slow: converting the pixmaps to PNG is quite
CPU expensive, and ends up annihilating any cache benefit.

In perf, we can see the CPU usage sky-rocketing in this case
and disabling the disc cache ends up using less CPU cycles...

We need to finish painting otherwise the card isn't painted and flashing
happens for a short moment

Fixes crash (easy to reproduce when together with MR #20)

(cherry picked from commit f5ef38e6)