From: terencehill Date: Sat, 2 Nov 2019 08:25:16 +0000 (+0000) Subject: Merge branch 'strength_soon' into 'master' X-Git-Tag: xonotic-v0.8.5~1233 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=f25341f890e7f0ea4c16cd36595a38c3e910d2be;hp=5014e9433f380d184be50049d071aec539ef3c8d Merge branch 'strength_soon' into 'master' Replace "quad soon" message with "strength soon" Closes #2315 See merge request xonotic/xonotic-data.pk3dir!728 --- diff --git a/binds-xonotic.cfg b/binds-xonotic.cfg index 3bdf790963..3046579ae4 100644 --- a/binds-xonotic.cfg +++ b/binds-xonotic.cfg @@ -121,7 +121,7 @@ bind F2 vno bind F3 spec // usercommands. These can be edited and bound by the menu. -seta "userbind1_press" "say_team quad soon"; seta "userbind1_release" ""; seta "userbind1_description" "team: quad soon" +seta "userbind1_press" "say_team strength soon"; seta "userbind1_release" ""; seta "userbind1_description" "team: strength soon" seta "userbind2_press" "say_team free item %x^7 (l:%y^7); g_waypointsprite_team_here_p"; seta "userbind2_release" ""; seta "userbind2_description" "team: free item, icon" seta "userbind3_press" "say_team took item (l:%l^7); g_waypointsprite_team_here"; seta "userbind3_release" ""; seta "userbind3_description" "team: took item, icon" seta "userbind4_press" "say_team negative"; seta "userbind4_release" ""; seta "userbind4_description" "team: negative" diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc index 38419bdc5a..3e61f9b5a6 100644 --- a/qcsrc/client/hud/panel/quickmenu.qc +++ b/qcsrc/client/hud/panel/quickmenu.qc @@ -790,7 +790,7 @@ void QuickMenu_Default(string target_submenu) if(teamplay) { QUICKMENU_SMENU(CTX(_("QMCMD^Team chat")), "Team chat") - QUICKMENU_ENTRY_TC(CTX(_("QMCMD^quad soon")), "say_team %s", "quad soon", CTX(_("QMCMD^quad soon"))) + QUICKMENU_ENTRY_TC(CTX(_("QMCMD^strength soon")), "say_team %s", "strength soon", CTX(_("QMCMD^strength soon"))) QUICKMENU_ENTRY_TC(CTX(_("QMCMD^free item, icon")), "say_team %s; g_waypointsprite_team_here_p", "free item %x^7 (l:%y^7)", CTX(_("QMCMD^free item %x^7 (l:%y^7)"))) QUICKMENU_ENTRY_TC(CTX(_("QMCMD^took item, icon")), "say_team %s; g_waypointsprite_team_here", "took item (l:%l^7)", CTX(_("QMCMD^took item (l:%l^7)"))) QUICKMENU_ENTRY_TC(CTX(_("QMCMD^negative")), "say_team %s", "negative", CTX(_("QMCMD^negative")))