D25564: Fix conflicts of shortcuts

[Aleix Pol Gonzalez]

apol accepted this revision.
This revision is now accepted and ready to land.

REPOSITORY
  R480 Kipi Plugins

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D25564

To: guoyunhe, #frameworks, apol