summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/setup_keyboard.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index d9117b8a..0f92d066 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -116,9 +116,8 @@ void Setup_Keyboard::apply()
if (keyboard.hasConflicts())
{
- new OkDialog(_("Key Conflict(s) Detected"),
- _("Resolve them, or gameplay may result in strange "
- "behaviour."));
+ new OkDialog(_("Key Conflict(s) Detected."),
+ keyboard.getBindError());
}
keyboard.setEnabled(true);
keyboard.store();