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"
When an application is not responding, its window is desaturated to communicate this. Also "(Not Responding)" is added to the title bar. Differential Revision: https://phabricator.kde.org/D5245