Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/keybinds.txt.de b/keybinds.txt.de
index 2aac70080a7e53e8e051ad6d7b2f470a2a631e7b..0f30ce2bf8d859dd6f4457e11ffd47f1384444c6 100644 (file)
--- a/keybinds.txt.de
+++ b/keybinds.txt.de
@@ -5,7 +5,8 @@
 "+moveright"                            "rechts"
 "+jump"                                 "springen / schwimmen"
 "+crouch"                               "ducken / sinken"
-"+hook"                                 "Enterhaken / Jetpack"
+"+hook"                                 "Enterhaken"
+"+jetpack"                              "Jetpack"
 ""                                      ""
 ""                                      "Angriff"
 "+fire"                                 "1. Feuermodus"
@@ -17,15 +18,15 @@
 "weaplast"                              "zuletzt benutzte"
 "weapbest"                              "beste"
 "reload"                                "nachladen"
-"weapon_group_1"                        "Laser"
+"weapon_group_1"                        "Blaster"
 "weapon_group_2"                        "Schrotgewehr"
-"weapon_group_3"                        "Maschinengewehr"
+"weapon_group_3"                        "Maschinengewehr / Arc"
 "weapon_group_4"                        "Mortar / Mine Layer"
 "weapon_group_5"                        "Electro"
 "weapon_group_6"                        "Crylink / HLAC"
-"weapon_group_7"                        "Nex / Gewehr"
+"weapon_group_7"                        "Vortex / Gewehr"
 "weapon_group_8"                        "Hagar / Seeker"
-"weapon_group_9"                        "Rocket Launcher / Fireball"
+"weapon_group_9"                        "Devastator / Fireball"
 "weapon_group_0"                        "Port-O-Launch / Enterhaken"
 ""                                      ""
 ""                                      "Anzeige"
@@ -34,6 +35,7 @@
 "+showscores"                           "Tabelle anzeigen"
 "screenshot"                            "Bildschirmfoto"
 "+hud_panel_radar_maximized"            "Radar maximieren"
+"cl_cmd hud minigame"                   "Minispiel-Menu an- und ausschalten"
 ""                                      ""
 ""                                      "Kommunikation"
 "messagemode"                           "Nachricht an alle"
@@ -53,11 +55,12 @@
 "messagemode2"                          "Nachricht ans Team"
 "team_auto"                             "Team automatisch wählen"
 "menu_showteamselect"                   "Team auswählen"
-"menu_showsandboxtools"                 "Sandbox-Menu"
+"menu_showsandboxtools"                 "Sandkasten menu"
 "spec"                                  "Zuschauen"
 "dropweapon"                            "Waffe wegwerfen"
 "+use"                                  "Schlüssel oder Flagge wegwerfen"
 "+button8"                              "Objekt ziehen"
+"toggle chase_active"                   "Schultercamera"
 ""                                      ""
 ""                                      "Benutzerdefiniert"
 "+userbind 1"                           "$userbind1"