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"
It specifies org.kde.plasmashell as the structures' target REVIEW: 128604
This way we can use kpackagetool5 against them (see RR 128590). REVIEW: 128596