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 924a4332)

So includes from there aren't found without the right path anymore.

This seems to break the build on some systems due to one definition rule
violations if the same header gets included from different locations. The
use of pragma once rather than conventional include guards doesn't catch
this.