Merge remote-tracking branch 'origin/master' into tzork/vehicles-2

diff --combined qcsrc/client/hud.qc
index 304affe153c8decf7b85849c8b123a3a2106e5bc,4728284a402562876d75286180e9cc935f27cedd..5acae2cff260d8365bae425992792f4d56f8a187
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -2793,7 -2793,7 +2793,7 @@@ void HUD_KillNotify(string s1, string s
                        HUD_KillNotify_Push(s1, s2, 1, DEATH_HURTTRIGGER);
                        if(alsoprint)
                                print(sprintf(_("^1%s^1 was thrown into a world of hurt by %s\n"), s2, s1));
 -              } else if(type == DEATH_SBCRUSH) {
 +              } else if(type == DEATH_VHCRUSH) {
                        HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
                        if(alsoprint)
                                print (sprintf(_("^1%s^1 was crushed by %s\n"), s2, s1));
@@@ -4958,7 -4958,7 +4958,7 @@@ void HUD_InfoMessages(void
                }
                else if(warmup_stage && !intermission && !spectatee_status)
                {
-                       s = strcat("^2Press ^3%s^2 to end warmup", getcommandkey("ready", "ready"));
+                       s = sprintf(_("^2Press ^3%s^2 to end warmup"), getcommandkey("ready", "ready"));
                        drawInfoMessage(s)
                }