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"

extend test case

CCBUG: 444157

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"

saves some vertical space, especially useful with longer device names

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"

They are unnecessary.

They are unnecessary.

This allows for a better organization of the repository. In addition,
it follows the structure of other KDE projects.