Merge branch 'master' into bones_was_here/centreprints

diff --cc qcsrc/common/notifications/all.inc
index f48f5060b1f79220e41a35cd192801bc50f81b1d,4e18a8a1dd402631245aa3c569708d04f2bcf580..5fe8699c2500699f61c9fa4b593468c0756e17a1
--- 1/qcsrc/common/notifications/all.inc
--- 2/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@@ -618,47 -607,47 +607,47 @@@ string multiteam_info_sprintf(string in
      MSG_CENTER_NOTIF(NADE_THROW,                        N_ENABLE,    0, 0, "nade_key",       CPID_NADES,             "0 0",  _("^BGPress ^F2%s^BG again to toss the nade!"), "")
      MSG_CENTER_NOTIF(NADE_BONUS,                        N_ENABLE,    0, 0, "",               CPID_NADES,             "0 0",  _("^F2You got a ^K1BONUS GRENADE^F2!"), "")
  
 -    MSG_CENTER_NOTIF(DEATH_SELF_AUTOTEAMCHANGE,         N_ENABLE,    0, 1, "death_team",     CPID_Null,              "0 0",  _("^BGYou have been moved into a different team\nYou are now on: %s"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_BETRAYAL,               N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1Don't shoot your team mates!"), _("^K1Don't go against your team mates!"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_CAMP,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1Die camper!"), _("^K1Reconsider your tactics, camper!"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_CHEAT,                  N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You unfairly eliminated yourself!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_CUSTOM,                 N_ENABLE,    2, 0, "s2",             CPID_Null,              "0 0",  _("^K1You were %s"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_DROWN,                  N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You couldn't catch your breath!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_FALL,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You hit the ground with a crunch!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_FIRE,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You got a little bit too crispy!"), _("^K1You felt a little too hot!"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_GENERIC,                N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You killed your own dumb self!"), _("^K1You need to be more careful!"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_LAVA,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You couldn't stand the heat!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_MONSTER,                N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You were killed by a monster!"), _("^K1You need to watch out for monsters!"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_NADE,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You forgot to put the pin back in!"), _("^K1Tastes like chicken!"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_NADE_NAPALM,            N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1Hanging around a napalm explosion is bad!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_NADE_ICE_FREEZE,        N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You got a little bit too cold!"), _("^K1You felt a little chilly!"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_NADE_HEAL,              N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1Your Healing Nade is a bit defective"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_NOAMMO,                 N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You were killed for running out of ammo..."), _("^K1You are respawning for running out of ammo..."))
 -    MSG_CENTER_NOTIF(DEATH_SELF_ROT,                    N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You grew too old without taking your medicine"), _("^K1You need to preserve your health"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_SHOOTING_STAR,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You became a shooting star!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_SLIME,                  N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You melted away in slime!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_SUICIDE,                N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You committed suicide!"), _("^K1You ended it all!"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_SWAMP,                  N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You got stuck in a swamp!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_TEAMCHANGE,             N_ENABLE,    0, 1, "death_team",     CPID_Null,              "0 0",  _("^BGYou are now on: %s"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_TOUCHEXPLODE,           N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You died in an accident!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_TURRET,                 N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You were fragged by a turret!"), _("^K1You had an unfortunate run in with a turret!"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_TURRET_EWHEEL,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You were fragged by an eWheel turret!"), _("^K1You had an unfortunate run in with an eWheel turret!"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_TURRET_WALK,            N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You were fragged by a Walker turret!"), _("^K1You had an unfortunate run in with a Walker turret!"))
 -    MSG_CENTER_NOTIF(DEATH_SELF_VH_BUMB_DEATH,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You got caught in the blast of a Bumblebee explosion!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_VH_CRUSH,               N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You were crushed by a vehicle!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_VH_RAPT_BOMB,           N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You were caught in a Raptor cluster bomb!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_VH_RAPT_DEATH,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You got caught in the blast of a Raptor explosion!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_VH_SPID_DEATH,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You got caught in the blast of a Spiderbot explosion!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_VH_SPID_ROCKET,         N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You were blasted to bits by a Spiderbot rocket!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_VH_WAKI_DEATH,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You got caught in the blast of a Racer explosion!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_VH_WAKI_ROCKET,         N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1You couldn't find shelter from a Racer rocket!"), "")
 -    MSG_CENTER_NOTIF(DEATH_SELF_VOID,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  _("^K1Watch your step!"), "")
 -
 -    MSG_CENTER_NOTIF(DEATH_TEAMKILL_FRAG,               N_ENABLE,    1, 0, "s1",             CPID_Null,              "0 0",  _("^K1Moron! You fragged ^BG%s^K1, a team mate!"), _("^K1Moron! You went against ^BG%s^K1, a team mate!"))
 -    MSG_CENTER_NOTIF(DEATH_TEAMKILL_FRAGGED,            N_ENABLE,    1, 0, "s1",             CPID_Null,              "0 0",  _("^K1You were fragged by ^BG%s^K1, a team mate"), _("^K1You were scored against by ^BG%s^K1, a team mate"))
 -
 -    MSG_CENTER_NOTIF(DISCONNECT_IDLING,                 N_ENABLE,    0, 1, "",               CPID_IDLING,            "1 f1", _("^K1Stop idling!\n^BGDisconnecting in ^COUNT..."), "")
 -    MSG_CENTER_NOTIF(MOVETOSPEC_IDLING,                 N_ENABLE,    0, 1, "",               CPID_IDLING,            "1 f1", _("^K1Stop idling!\n^BGMoving to spectators in ^COUNT..."), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_AUTOTEAMCHANGE,         N_ENABLE,    0, 1, "death_team",     CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^BGYou have been moved into a different team\nYou are now on: %s")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_BETRAYAL,               N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You were punished for attacking your team mates!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_CAMP,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1Die camper!")), strcat(BOLD_OPERATOR, _("^K1Reconsider your tactics, camper!")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_CHEAT,                  N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You unfairly eliminated yourself!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_CUSTOM,                 N_ENABLE,    2, 0, "s2",             CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You were %s")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_DROWN,                  N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You couldn't catch your breath!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_FALL,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You hit the ground with a crunch!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_FIRE,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You got a little bit too crispy!")), strcat(BOLD_OPERATOR, _("^K1You felt a little too hot!")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_GENERIC,                N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You killed your own dumb self!")), strcat(BOLD_OPERATOR, _("^K1You need to be more careful!")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_LAVA,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You couldn't stand the heat!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_MONSTER,                N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You were killed by a monster!")), strcat(BOLD_OPERATOR, _("^K1You need to watch out for monsters!")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_NADE,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You forgot to put the pin back in!")), strcat(BOLD_OPERATOR, _("^K1Tastes like chicken!")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_NADE_NAPALM,            N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1Hanging around a napalm explosion is bad!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_NADE_ICE_FREEZE,        N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You got a little bit too cold!")), strcat(BOLD_OPERATOR, _("^K1You felt a little chilly!")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_NADE_HEAL,              N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1Your Healing Nade is a bit defective")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_NOAMMO,                 N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You were killed for running out of ammo...")), strcat(BOLD_OPERATOR, _("^K1You are respawning for running out of ammo...")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_ROT,                    N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You grew too old without taking your medicine")), strcat(BOLD_OPERATOR, _("^K1You need to preserve your health")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_SHOOTING_STAR,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You became a shooting star!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_SLIME,                  N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You melted away in slime!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_SUICIDE,                N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You committed suicide!")), strcat(BOLD_OPERATOR, _("^K1You ended it all!")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_SWAMP,                  N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You got stuck in a swamp!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_TEAMCHANGE,             N_ENABLE,    0, 1, "death_team",     CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^BGYou are now on: %s")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_TOUCHEXPLODE,           N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You died in an accident!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_TURRET,                 N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You were fragged by a turret!")), strcat(BOLD_OPERATOR, _("^K1You had an unfortunate run in with a turret!")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_TURRET_EWHEEL,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You were fragged by an eWheel turret!")), strcat(BOLD_OPERATOR, _("^K1You had an unfortunate run in with an eWheel turret!")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_TURRET_WALK,            N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You were fragged by a Walker turret!")), strcat(BOLD_OPERATOR, _("^K1You had an unfortunate run in with a Walker turret!")))
 +    MSG_CENTER_NOTIF(DEATH_SELF_VH_BUMB_DEATH,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You got caught in the blast of a Bumblebee explosion!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_VH_CRUSH,               N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You were crushed by a vehicle!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_VH_RAPT_BOMB,           N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You were caught in a Raptor cluster bomb!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_VH_RAPT_DEATH,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You got caught in the blast of a Raptor explosion!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_VH_SPID_DEATH,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You got caught in the blast of a Spiderbot explosion!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_VH_SPID_ROCKET,         N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You were blasted to bits by a Spiderbot rocket!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_VH_WAKI_DEATH,          N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You got caught in the blast of a Racer explosion!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_VH_WAKI_ROCKET,         N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You couldn't find shelter from a Racer rocket!")), "")
 +    MSG_CENTER_NOTIF(DEATH_SELF_VOID,                   N_ENABLE,    0, 0, "",               CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1Watch your step!")), "")
 +
 +    MSG_CENTER_NOTIF(DEATH_TEAMKILL_FRAG,               N_ENABLE,    1, 0, "s1",             CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1Traitor! You team killed ^BG%s")), strcat(BOLD_OPERATOR, _("^K1Traitor! You betrayed team mate ^BG%s")))
 +    MSG_CENTER_NOTIF(DEATH_TEAMKILL_FRAGGED,            N_ENABLE,    1, 0, "s1",             CPID_Null,              "0 0",  strcat(BOLD_OPERATOR, _("^K1You were team killed by ^BG%s")), strcat(BOLD_OPERATOR, _("^K1You were betrayed by team mate ^BG%s")))
 +
 +    MSG_CENTER_NOTIF(DISCONNECT_IDLING,                 N_ENABLE,    0, 1, "",               CPID_IDLING,            "1 f1", strcat(BOLD_OPERATOR, _("^K1Stop idling!\n^BGDisconnecting in ^COUNT...")), "")
-     MSG_CENTER_NOTIF(MOVETOSPEC_IDLING,                 N_ENABLE,    0, 1, "",               CPID_IDLING,            "1 f1", strcat(BOLD_OPERATOR, _("^K1Stop idling!\n^BGMoving to spectator in ^COUNT...")), "")
++    MSG_CENTER_NOTIF(MOVETOSPEC_IDLING,                 N_ENABLE,    0, 1, "",               CPID_IDLING,            "1 f1", strcat(BOLD_OPERATOR, _("^K1Stop idling!\n^BGMoving to spectators in ^COUNT...")), "")
  
      MSG_CENTER_NOTIF(DOOR_LOCKED_NEED,                  N_ENABLE,    1, 0, "s1",             CPID_Null,              "0 0",  _("^BGYou need %s^BG!"), "")
      MSG_CENTER_NOTIF(DOOR_LOCKED_ALSONEED,              N_ENABLE,    1, 0, "s1",             CPID_Null,              "0 0",  _("^BGYou also need %s^BG!"), "")