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"
It uses a --statusnotifier modifier that will be available since plasma 5.2 that will place it in the system tray.