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"
This quicksetting plugion allows the user to open the KScreen OSD which makes it easy to reconfigure a multiscreen setup. It's only available when more than one monitor is connected. Signed-off-by: Sebastian Kügler <sebas@kde.org>