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 3892b758)

(cherry picked from commit 2968a8a3)

And omit value argument, which is true by default anyway.

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

Also add/move license files as required by REUSE specification.

GIT_SILENT

GIT_SILENT

GIT_SILENT

(cherry picked from commit f187462b)

(cherry picked from commit b0ee5e17)

(cherry picked from commit db23e605)