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"
Summary: Allows ringing devices from KRunner Test Plan: Enter find, ring, or device name, activate entry Reviewers: #kde_connect, #plasma, broulik, davidedmundson, apol Reviewed By: #kde_connect, apol Subscribers: sredman, apol, kdeconnect Tags: #kde_connect Differential Revision: https://phabricator.kde.org/D14607