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

(cherry picked from commit ad0e4922)

(cherry picked from commit d602f87e)

(cherry picked from commit fe0f3957)

(cherry picked from commit 7ae5c4e9)

(cherry picked from commit b812d771)

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 399cd265)

(cherry picked from commit 8b4c0013)

(cherry picked from commit 08d5f92a)

(cherry picked from commit 2facc970)