diff options
| author | Andrei Karas <akaras@inbox.ru> | 2009-10-09 23:27:51 +0300 |
|---|---|---|
| committer | Blue <bluesansdouze@gmail.com> | 2010-01-08 23:24:04 +0100 |
| commit | 104266da0f92ab2a765598dde59bf2e7f6426484 (patch) | |
| tree | ab3f08a5b362b9a77978513bbea75081afdfb5c5 /src/gui/setup_keyboard.cpp | |
| parent | c1ddf4c0840bb15016dc69af4a4751d09908393f (diff) | |
| download | mana-104266da0f92ab2a765598dde59bf2e7f6426484.tar.gz mana-104266da0f92ab2a765598dde59bf2e7f6426484.tar.bz2 mana-104266da0f92ab2a765598dde59bf2e7f6426484.tar.xz mana-104266da0f92ab2a765598dde59bf2e7f6426484.zip | |
Show first key binding conflict
Diffstat (limited to 'src/gui/setup_keyboard.cpp')
| -rw-r--r-- | src/gui/setup_keyboard.cpp | 5 |
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(); |