Merge branch 'master' into terencehill/music_player

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

diff --git a/keybinds.txt.de b/keybinds.txt.de
index 53f73351be4af16fce89f122d68587644eebdb23..9a6d9e98272e3214c8e8bdb86fef39f2f169c5fa 100644 (file)
--- a/keybinds.txt.de
+++ b/keybinds.txt.de
@@ -17,22 +17,23 @@
 "weaplast"                              "zuletzt benutzte"
 "weapbest"                              "beste"
 "reload"                                "nachladen"
-"impulse 1"                             "Laser"
-"impulse 2"                             "Shotgun"
-"impulse 3"                             "Machine Gun"
-"impulse 4"                             "Mortar / Mine Layer"
-"impulse 5"                             "Electro"
-"impulse 6"                             "Crylink / HLAC"
-"impulse 7"                             "Nex / MinstaNex / Rifle"
-"impulse 8"                             "Hagar / Seeker"
-"impulse 9"                             "Rocket Launcher / Fireball"
-"impulse 14"                            "Port-O-Launch / Hook"
+"weapon_group_1"                        "Blaster"
+"weapon_group_2"                        "Schrotgewehr"
+"weapon_group_3"                        "Maschinengewehr / Arc"
+"weapon_group_4"                        "Mortar / Mine Layer"
+"weapon_group_5"                        "Electro"
+"weapon_group_6"                        "Crylink / HLAC"
+"weapon_group_7"                        "Vortex / Gewehr"
+"weapon_group_8"                        "Hagar / Seeker"
+"weapon_group_9"                        "Devastator / Fireball"
+"weapon_group_0"                        "Port-O-Launch / Enterhaken"
 ""                                      ""
 ""                                      "Anzeige"
 "+zoom"                                 "Vergrößern (festhalten)"
 "togglezoom"                            "Vergrößern (umschalten)"
 "+showscores"                           "Tabelle anzeigen"
 "screenshot"                            "Bildschirmfoto"
+"+hud_panel_radar_maximized"            "Radar maximieren"
 ""                                      ""
 ""                                      "Kommunikation"
 "messagemode"                           "Nachricht an alle"
@@ -46,15 +47,18 @@
 "+show_info"                            "Serverinfo anzeigen"
 "toggleconsole"                         "Konsole öffnen"
 "disconnect"                            "Verbindung trennen"
-"menu_showquitdialog"                   "Beenden"
+"menu_showquitdialog"                                  "Beenden"
 ""                                      ""
 ""                                      "Teamplay"
 "messagemode2"                          "Nachricht ans Team"
 "team_auto"                             "Team automatisch wählen"
 "menu_showteamselect"                   "Team auswählen"
+"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"