summaryrefslogtreecommitdiff
path: root/src/gui/setupactiondata.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-01-30 22:10:01 +0300
committerAndrei Karas <akaras@inbox.ru>2014-01-31 01:06:49 +0300
commitec5a06754164bb2f77d3627990f896c040fc1c76 (patch)
treecad8586f26675a80d7dae4c878a7436ac73feefd /src/gui/setupactiondata.h
parent5015c59af9d28b3a3bbedfd54b3827dd96597efa (diff)
downloadmanaplus-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.gz
manaplus-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.bz2
manaplus-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.xz
manaplus-ec5a06754164bb2f77d3627990f896c040fc1c76.zip
Combine "Mod" and "Stop attack" keys.
Remove old "Mod" key because it conflicting with "Stop attack"
Diffstat (limited to 'src/gui/setupactiondata.h')
-rw-r--r--src/gui/setupactiondata.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index b80052b30..2b9d694a8 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -96,7 +96,7 @@ static SetupActionData setupActionData0[] =
},
{
// TRANSLATORS: input action name
- N_("Stop Attack"),
+ N_("Stop Attack / Modifier key"),
Input::KEY_STOP_ATTACK,
"",
},
@@ -1368,12 +1368,6 @@ static SetupActionData setupActionData6[] =
},
{
// TRANSLATORS: input action name
- N_("Modifier key"),
- Input::KEY_MOD,
- "",
- },
- {
- // TRANSLATORS: input action name
N_("Show onscreen keyboard"),
Input::KEY_SHOW_KEYBOARD,
"",