From: Mario <mario@smbclan.net>
Date: Fri, 15 Jun 2018 15:28:18 +0000 (+1000)
Subject: Consistently refer to the jetpack as that (not jet pack)
X-Git-Tag: xonotic-v0.8.5~2046
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=7bdde7c66c618afdf21cfcc34e9cb3932dc60672;p=xonotic%2Fxonotic-data.pk3dir.git

Consistently refer to the jetpack as that (not jet pack)
---

diff --git a/qcsrc/common/items/item/jetpack.qh b/qcsrc/common/items/item/jetpack.qh
index 73f55e83f..c56d682fe 100644
--- a/qcsrc/common/items/item/jetpack.qh
+++ b/qcsrc/common/items/item/jetpack.qh
@@ -35,10 +35,10 @@ REGISTER_ITEM(Jetpack, Powerup) {
     this.m_itemid               =   IT_JETPACK;
 #endif
     this.netname                =   "jetpack";
-    this.m_name                 =   "Jet pack";
+    this.m_name                 =   "Jetpack";
     this.m_icon                 =   "jetpack";
     this.m_color                =   '0.5 0.5 0.5';
-    this.m_waypoint             =   _("Jet Pack");
+    this.m_waypoint             =   _("Jetpack");
     this.m_waypointblink        =   2;
 #ifdef SVQC
     this.m_botvalue             =   3000;
diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc
index b4d14034d..a15ef80d1 100644
--- a/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@ -697,7 +697,7 @@
     MSG_CENTER_NOTIF(ITEM_BUFF_DROP,                    N_ENABLE,    0, 1, "item_buffname",                      CPID_ITEM, "item_centime 0", _("^BGYou dropped the %s^BG buff!"), "")
     MSG_CENTER_NOTIF(ITEM_BUFF_GOT,                     N_ENABLE,    0, 1, "item_buffname",                      CPID_ITEM, "item_centime 0", _("^BGYou got the %s^BG buff!"), "")
     MSG_CENTER_NOTIF(ITEM_FUELREGEN_GOT,                N_ENABLE,    0, 0, "",                                   CPID_ITEM, "item_centime 0", _("^BGYou got the ^F1Fuel regenerator"), "")
-    MSG_CENTER_NOTIF(ITEM_JETPACK_GOT,                  N_ENABLE,    0, 0, "",                                   CPID_ITEM, "item_centime 0", _("^BGYou got the ^F1Jet pack"), "")
+    MSG_CENTER_NOTIF(ITEM_JETPACK_GOT,                  N_ENABLE,    0, 0, "",                                   CPID_ITEM, "item_centime 0", _("^BGYou got the ^F1Jetpack"), "")
     MSG_CENTER_NOTIF(ITEM_WEAPON_DONTHAVE,              N_ENABLE,    0, 1, "item_wepname",                       CPID_ITEM, "item_centime 0", _("^BGYou do not have the ^F1%s"), "")
     MSG_CENTER_NOTIF(ITEM_WEAPON_DROP,                  N_ENABLE,    1, 1, "item_wepname item_wepammo",          CPID_ITEM, "item_centime 0", _("^BGYou dropped the ^F1%s^BG%s"), "")
     MSG_CENTER_NOTIF(ITEM_WEAPON_GOT,                   N_ENABLE,    0, 1, "item_wepname",                       CPID_ITEM, "item_centime 0", _("^BGYou got the ^F1%s"), "")
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
index 994c5a7c9..6d974ccb4 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
@@ -87,7 +87,7 @@ string XonoticMutatorsDialog_toString(entity me)
 	if(cvar("g_bloodloss") > 0)
 		s = cons_mid(s, ", ", _("Blood loss"));
 	if(cvar("g_jetpack"))
-		s = cons_mid(s, ", ", _("Jet pack"));
+		s = cons_mid(s, ", ", _("Jetpack"));
 	if(cvar("g_buffs") > 0)
 		s = cons_mid(s, ", ", _("Buffs"));
 	if(cvar("g_overkill"))
@@ -209,7 +209,7 @@ void XonoticMutatorsDialog_fill(entity me)
 			_("Players spawn with the grappling hook")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.8, e = makeXonoticCheckBox_T(0, "g_jetpack", _("Jet pack"),
+		me.TD(me, 1, 1.8, e = makeXonoticCheckBox_T(0, "g_jetpack", _("Jetpack"),
 			_("Players spawn with the jetpack")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc
index cde80d693..a14406bce 100644
--- a/qcsrc/menu/xonotic/keybinder.qc
+++ b/qcsrc/menu/xonotic/keybinder.qc
@@ -34,7 +34,7 @@ void Xonotic_KeyBinds_Read()
 	KEYBIND_DEF("+jump"                                 , _("jump / swim"));
 	KEYBIND_DEF("+crouch"                               , _("crouch / sink"));
 	KEYBIND_DEF("+hook"                                 , _("off-hand hook"));
-	KEYBIND_DEF("+jetpack"                              , _("jet pack"));
+	KEYBIND_DEF("+jetpack"                              , _("jetpack"));
 	KEYBIND_DEF(""                                      , "");
 	KEYBIND_DEF(""                                      , _("Attacking"));
 	KEYBIND_DEF("+fire"                                 , _("primary fire"));
diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index d9bab5d7f..b0d9e0992 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -116,7 +116,7 @@ string getwelcomemessage(entity this)
 	if(g_weapon_stay && !g_cts)
 		modifications = strcat(modifications, ", Weapons stay");
 	if(g_jetpack)
-		modifications = strcat(modifications, ", Jet pack");
+		modifications = strcat(modifications, ", Jetpack");
 	if(autocvar_g_powerups == 0)
 		modifications = strcat(modifications, ", No powerups");
 	if(autocvar_g_powerups > 0)