GitLab

(cherry picked from commit ed3c8ae7)

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 1327e468)

(cherry picked from commit ea66f8fb)

(cherry picked from commit cbdd1eff)

(cherry picked from commit 1c7afcf2)

(cherry picked from commit f617ef9c)

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 44b02655)

(cherry picked from commit 8eea5523)

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

(cherry picked from commit 8cfefc03)

(cherry picked from commit ed8ebb3e)