Merge branch 'terencehill/scoreboard_ui' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / keybinder.qc

diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc
index e1956b394636d02c341511c90fcf8e21ae55dd05..5a0f9f487f0b5f9b58686f0fcc40f77458d04efa 100644 (file)
--- a/qcsrc/menu/xonotic/keybinder.qc
+++ b/qcsrc/menu/xonotic/keybinder.qc
@@ -33,8 +33,8 @@ void KeyBinds_BuildList()
        #define KEYBIND_SPECIAL_DEF(key, desc) KEYBIND_DEF(strcat("*", key), desc)
 
        KEYBIND_HEADER(_("Moving"));
-       KEYBIND_DEF("+forward"                              , _("forward"));
-       KEYBIND_DEF("+back"                                 , _("backpedal"));
+       KEYBIND_DEF("+forward"                              , _("move forwards"));
+       KEYBIND_DEF("+back"                                 , _("move backwards"));
        KEYBIND_DEF("+moveleft"                             , _("strafe left"));
        KEYBIND_DEF("+moveright"                            , _("strafe right"));
        KEYBIND_DEF("+jump"                                 , _("jump / swim"));
@@ -106,12 +106,12 @@ void KeyBinds_BuildList()
        KEYBIND_DEF("toggleconsole"                         , _("enter console"));
                string console_shortcut = strcat(translate_key("SHIFT"), "+", translate_key("ESCAPE"));
                KEYBIND_SPECIAL_DEF(console_shortcut, _("enter console"));
-       KEYBIND_DEF("menu_showquitdialog"                   , _("quit / leave match"));
+       KEYBIND_DEF("menu_showquitdialog"                   , _("quit"));
        KEYBIND_EMPTY_LINE();
 
        KEYBIND_HEADER(_("Teamplay"));
        KEYBIND_DEF("team_auto"                             , _("auto-join team"));
-       KEYBIND_DEF("menu_showteamselect"                   , _("team menu"));
+       KEYBIND_DEF("scoreboard_team_selection"             , _("team selection"));
        KEYBIND_DEF("spec"                                  , _("spectate"));
        KEYBIND_EMPTY_LINE();
 
@@ -119,7 +119,6 @@ void KeyBinds_BuildList()
        KEYBIND_DEF("+use"                                  , _("drop key/flag, exit vehicle"));
        KEYBIND_DEF("kill"                                  , _("suicide / respawn"));
        KEYBIND_DEF("quickmenu"                             , _("quick menu"));
-       KEYBIND_DEF("menu_showgamemenudialog"               , _("game menu"));
        KEYBIND_EMPTY_LINE();
 
        KEYBIND_HEADER(_("User defined"));