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"
Currently the plasmoid is still written for KF5/Plasma 5, and in addition it also still uses PlasmaComponents2 stuff, which has been removed in KF6/Plasma 6. So, this is an attempt to port the plasmoid so that it works in Plasma 6. BUG: 476389