Merge branch 'master' into divVerent/gettextizing-the-source

[xonotic/xonotic-data.pk3dir.git] / keybinds.txt

diff --git a/keybinds.txt b/keybinds.txt
index d4c35123aeddf0f3c2c5a5c66b34cf4a94981b20..da262082e983979a4fe1b0b5aef9e480299f2c0f 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -8,8 +8,8 @@
 "+hook"                                 "off-hand hook / jet pack"
 ""                                      ""
 ""                                      "Attacking"
-"+preattack"                            "primary fire"
-"+preattack2"                           "secondary fire"
+"+fire"                                 "primary fire"
+"+fire2"                                "secondary fire"
 ""                                      ""
 ""                                      "Weapon switching"
 "weapprev"                              "previous"
@@ -29,9 +29,9 @@
 "impulse 14"                            "porto / hook"
 ""                                      ""
 ""                                      "View"
-"+zoom"                                 "zoom"
+"+zoom"                                 "hold zoom"
+"togglezoom"                            "toggle zoom"
 "+showscores"                           "show scores"
-"+showaccuracy"                                "show accuracy"
 "screenshot"                            "screen shot"
 ""                                      ""
 ""                                      "Communicate"