diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-08-10 20:16:22 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-08-10 20:16:22 -0600 |
| commit | 56865a2c98a589a1e530e296b1681e369e2ae48f (patch) | |
| tree | c3ea1115b5afcca197c87e1a257f34583b2d57ce /src/gui/setup_keyboard.cpp | |
| parent | 7a7018c517948c2cc567d28d221c5cd8a91f2c12 (diff) | |
| parent | 0ebdce30ee61d7b038e81bc64ae7d1e27d98a144 (diff) | |
| download | mana-client-56865a2c98a589a1e530e296b1681e369e2ae48f.tar.gz mana-client-56865a2c98a589a1e530e296b1681e369e2ae48f.tar.bz2 mana-client-56865a2c98a589a1e530e296b1681e369e2ae48f.tar.xz mana-client-56865a2c98a589a1e530e296b1681e369e2ae48f.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/setup_keyboard.cpp')
| -rw-r--r-- | src/gui/setup_keyboard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index 938c1c4e..d9117b8a 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -116,7 +116,7 @@ void Setup_Keyboard::apply() if (keyboard.hasConflicts()) { - new OkDialog(_("Key Conflict(s) Detected."), + new OkDialog(_("Key Conflict(s) Detected"), _("Resolve them, or gameplay may result in strange " "behaviour.")); } |