Improve keyboard shortcut conflict message

When customizing keyboard shortcuts, the error message saying that there is a conflict with another shortcut doesn’t list the conflicting shortcuts. It should, and I assume this is not too hard, since if it knows there is a conflict, I assume it knows which shortcuts are conflicting.