GitLab

(cherry picked from commit 86b762cb)

GIT_SILENT

(cherry picked from commit 578d335e)

(cherry picked from commit cc49c104)

(cherry picked from commit 7303b82d)

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

(cherry picked from commit 5be34a4f)

(cherry picked from commit c09c83b0)

(cherry picked from commit 125c78ed)

(cherry picked from commit 97ea9221)

(cherry picked from commit 740dc635)