GitLab

GIT_SILENT

(cherry picked from commit fca9da68)

(cherry picked from commit b1c64404)

(cherry picked from commit 9f9f6531)

(cherry picked from commit ae38b684)

(cherry picked from commit 26318e0b)

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 520882ae)

(cherry picked from commit f20138bf)

(cherry picked from commit 498ee159)

(cherry picked from commit e7df9161)